Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs =================================================================== diff -u -r28fb1b160a865640e7a069cb594862563e18add5 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs (.../PipingOutputCreateExtensions.cs) (revision 28fb1b160a865640e7a069cb594862563e18add5) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingOutputCreateExtensions.cs (.../PipingOutputCreateExtensions.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -46,6 +46,7 @@ SellmeijerZValue = output.SellmeijerZValue.ToNaNAsNull(), UpliftFactorOfSafety = output.UpliftFactorOfSafety.ToNaNAsNull(), UpliftZValue = output.UpliftZValue.ToNaNAsNull(), + UpliftEffectiveStress = output.UpliftEffectiveStress.Value.ToNaNAsNull(), HeaveGradient = output.HeaveGradient.Value.ToNaNAsNull(), SellmeijerCreepCoefficient = output.SellmeijerCreepCoefficient.Value.ToNaNAsNull(), SellmeijerCriticalFall = output.SellmeijerCriticalFall.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,20 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class AssessmentSectionEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public AssessmentSectionEntity() { FailureMechanismEntities = new HashSet(); HydraulicLocationEntities = new HashSet(); } - + public long AssessmentSectionEntityId { get; set; } public long ProjectEntityId { get; set; } public string Id { get; set; } @@ -53,13 +53,11 @@ public short Composition { get; set; } public string ReferenceLinePointXml { get; set; } public int Order { get; set; } - + public virtual ProjectEntity ProjectEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HydraulicLocationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CalculationGroupEntity.cs (.../CalculationGroupEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class CalculationGroupEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public CalculationGroupEntity() { CalculationGroupEntity1 = new HashSet(); @@ -50,42 +49,32 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long CalculationGroupEntityId { get; set; } public Nullable ParentCalculationGroupEntityId { get; set; } public string Name { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CalculationGroupEntity1 { get; set; } - public virtual CalculationGroupEntity CalculationGroupEntity2 { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/CharacteristicPointEntity.cs (.../CharacteristicPointEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class CharacteristicPointEntity { public long CharacteristicPointEntityId { get; set; } @@ -40,7 +41,7 @@ public Nullable X { get; set; } public Nullable Y { get; set; } public Nullable Z { get; set; } - + public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureEntity.cs (.../ClosingStructureEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ClosingStructureEntity() { ClosingStructuresCalculationEntities = new HashSet(); } - + public long ClosingStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -73,10 +72,9 @@ public int IdenticalApertures { get; set; } public Nullable FailureProbabilityReparation { get; set; } public byte InflowModelType { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructureFailureMechanismMetaEntity.cs (.../ClosingStructureFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructureFailureMechanismMetaEntity { public long ClosingStructureFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N2A { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresCalculationEntity.cs (.../ClosingStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ClosingStructuresCalculationEntity() { ClosingStructuresOutputEntities = new HashSet(); ClosingStructuresSectionResultEntities = new HashSet(); } - + public long ClosingStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -51,7 +50,18 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public short BreakWaterType { get; set; } + public Nullable BreakWaterHeight { get; set; } + public byte UseForeshore { get; set; } public Nullable Orientation { get; set; } + public Nullable StructureNormalOrientation { get; set; } + public Nullable StorageStructureAreaMean { get; set; } + public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } + public Nullable AllowedLevelIncreaseStorageMean { get; set; } + public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } + public Nullable WidthFlowAperturesMean { get; set; } + public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable LevelCrestStructureNotClosingMean { get; set; } public Nullable LevelCrestStructureNotClosingStandardDeviation { get; set; } public Nullable InsideWaterLevelMean { get; set; } @@ -60,43 +70,29 @@ public Nullable ThresholdHeightOpenWeirStandardDeviation { get; set; } public Nullable AreaFlowAperturesMean { get; set; } public Nullable AreaFlowAperturesStandardDeviation { get; set; } + public Nullable CriticalOvertoppingDischargeMean { get; set; } + public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } + public Nullable FlowWidthAtBottomProtectionMean { get; set; } + public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } public double ProbabilityOrFrequencyOpenStructureBeforeFlooding { get; set; } public double FailureProbabilityOpenStructure { get; set; } public int IdenticalApertures { get; set; } public double FailureProbabilityReparation { get; set; } public byte InflowModelType { get; set; } + public double FailureProbabilityStructureWithErosion { get; set; } public Nullable DeviationWaveDirection { get; set; } public Nullable DrainCoefficientMean { get; set; } + public Nullable ModelFactorSuperCriticalFlowMean { get; set; } + public Nullable StormDurationMean { get; set; } public Nullable FactorStormDurationOpenStructure { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ClosingStructureEntity ClosingStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ClosingStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } - - public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } - public Nullable BreakWaterHeight { get; set; } - public byte UseForeshore { get; set; } - public Nullable StructureNormalOrientation { get; set; } - public Nullable StorageStructureAreaMean { get; set; } - public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } - public Nullable AllowedLevelIncreaseStorageMean { get; set; } - public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } - public Nullable CriticalOvertoppingDischargeMean { get; set; } - public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } - public Nullable FlowWidthAtBottomProtectionMean { get; set; } - public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } - public double FailureProbabilityStructureWithErosion { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } - public Nullable StormDurationMean { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ClosingStructuresOutputEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresOutputEntity.cs (.../ClosingStructuresOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresOutputEntity { public long ClosingStructuresOutputEntityId { get; set; } public long ClosingStructuresCalculationEntityId { get; set; } - - public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ClosingStructuresSectionResultEntity.cs (.../ClosingStructuresSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ClosingStructuresSectionResultEntity { public long ClosingStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable ClosingStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual ClosingStructuresCalculationEntity ClosingStructuresCalculationEntity { get; set; } public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r064557819261426179042d10f40a25b3fc23aeec -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 064557819261426179042d10f40a25b3fc23aeec) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 13-Dec-2016 11:03:20 AM */ +/* Created On : 13-dec-2016 11:22:15 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -9,16 +9,16 @@ DROP TABLE IF EXISTS 'VersionEntity' ; -DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity' +DROP TABLE IF EXISTS 'GrassCoverErosionInwardsDikeHeightOutputEntity' ; DROP TABLE IF EXISTS 'ProjectEntity' ; -DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'AssessmentSectionEntity' ; -DROP TABLE IF EXISTS 'AssessmentSectionEntity' +DROP TABLE IF EXISTS 'StabilityPointStructuresCalculationEntity' ; DROP TABLE IF EXISTS 'FailureMechanismSectionEntity' @@ -27,37 +27,40 @@ DROP TABLE IF EXISTS 'FailureMechanismEntity' ; -DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'PipingFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'ClosingStructureFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'StabilityPointStructuresFailureMechanismMetaEntity' ; DROP TABLE IF EXISTS 'CalculationGroupEntity' ; -DROP TABLE IF EXISTS 'HydraulicLocationEntity' +DROP TABLE IF EXISTS 'HeightStructuresFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +DROP TABLE IF EXISTS 'HydraulicLocationEntity' ; DROP TABLE IF EXISTS 'PipingCalculationEntity' ; +DROP TABLE IF EXISTS 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +; + DROP TABLE IF EXISTS 'GrassCoverErosionInwardsCalculationEntity' ; DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsFailureMechanismMetaEntity' ; -DROP TABLE IF EXISTS 'SoilProfileEntity' +DROP TABLE IF EXISTS 'SoilLayerEntity' ; -DROP TABLE IF EXISTS 'SoilLayerEntity' +DROP TABLE IF EXISTS 'SoilProfileEntity' ; DROP TABLE IF EXISTS 'StochasticSoilProfileEntity' @@ -192,9 +195,6 @@ DROP TABLE IF EXISTS 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ; -DROP TABLE IF EXISTS 'GrassCoverErosionInwardsDikeHeightOutputEntity' -; - /* Create Tables with Primary and Foreign Keys, Check and Unique Constraints */ CREATE TABLE 'VersionEntity' @@ -206,6 +206,45 @@ ) ; +CREATE TABLE 'GrassCoverErosionInwardsDikeHeightOutputEntity' +( + 'GrassCoverErosionInwardsDikeHeightOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'GrassCoverErosionInwardsOutputEntityId' INTEGER NOT NULL, + 'DikeHeight' REAL, + 'TargetProbability' REAL, + 'TargetReliability' REAL, + 'CalculatedProbability' REAL, + 'CalculatedReliability' REAL, + 'CalculationConvergence' TINYINT (1) NOT NULL, -- NotCalculated, CalculatedNotConverged or CalculatedConverged + CONSTRAINT 'FK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputEntityId') ON DELETE Cascade ON UPDATE Cascade, + CONSTRAINT 'U_GrassCoverErosionInwardsOutputEntity' UNIQUE ('GrassCoverErosionInwardsOutputEntityId') +) +; + +CREATE TABLE 'ProjectEntity' +( + 'ProjectEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Description' VARCHAR (260) +) +; + +CREATE TABLE 'AssessmentSectionEntity' +( + 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'ProjectEntityId' INTEGER NOT NULL, + 'Id' TEXT, + 'Name' VARCHAR (260), + 'Comments' TEXT, + 'Norm' REAL NOT NULL, + 'HydraulicDatabaseVersion' TEXT, + 'HydraulicDatabaseLocation' TEXT, + 'Composition' SMALLINT NOT NULL, -- Enum: Dike = 1 Dune = 2 DikeAndDune = 3 + 'ReferenceLinePointXml' TEXT, + 'Order' INT (4) NOT NULL, + CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'StabilityPointStructuresCalculationEntity' ( 'StabilityPointStructuresCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -279,40 +318,6 @@ ) ; -CREATE TABLE 'ProjectEntity' -( - 'ProjectEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Description' VARCHAR (260) -) -; - -CREATE TABLE 'PipingFailureMechanismMetaEntity' -( - 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'A' REAL NOT NULL, - 'WaterVolumetricWeight' REAL NOT NULL, - CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - -CREATE TABLE 'AssessmentSectionEntity' -( - 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'ProjectEntityId' INTEGER NOT NULL, - 'Id' TEXT, - 'Name' VARCHAR (260), - 'Comments' TEXT, - 'Norm' REAL NOT NULL, - 'HydraulicDatabaseVersion' TEXT, - 'HydraulicDatabaseLocation' TEXT, - 'Composition' SMALLINT NOT NULL, -- Enum: Dike = 1 Dune = 2 DikeAndDune = 3 - 'ReferenceLinePointXml' TEXT, - 'Order' INT (4) NOT NULL, - CONSTRAINT 'FK_AssessmentSectionEntity_ProjectEntity' FOREIGN KEY ('ProjectEntityId') REFERENCES 'ProjectEntity' ('ProjectEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'FailureMechanismSectionEntity' ( 'FailureMechanismSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -339,12 +344,13 @@ ) ; -CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity' +CREATE TABLE 'PipingFailureMechanismMetaEntity' ( - 'StrengthStabilityPointConstructionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'PipingFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, - 'N' INT (4) NOT NULL, - CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade + 'A' REAL NOT NULL, + 'WaterVolumetricWeight' REAL NOT NULL, + CONSTRAINT 'FK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -357,12 +363,12 @@ ) ; -CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' +CREATE TABLE 'StabilityPointStructuresFailureMechanismMetaEntity' ( - 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'StrengthStabilityPointConstructionFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'FailureMechanismEntityId' INTEGER NOT NULL, 'N' INT (4) NOT NULL, - CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade + CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade ) ; @@ -376,6 +382,15 @@ ) ; +CREATE TABLE 'HeightStructuresFailureMechanismMetaEntity' +( + 'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'HydraulicLocationEntity' ( 'HydraulicLocationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -389,15 +404,6 @@ ) ; -CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' -( - 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'FailureMechanismEntityId' INTEGER NOT NULL, - 'N' INT (4) NOT NULL, - CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade -) -; - CREATE TABLE 'PipingCalculationEntity' ( 'PipingCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -425,6 +431,15 @@ ) ; +CREATE TABLE 'GrassCoverErosionInwardsFailureMechanismMetaEntity' +( + 'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'FailureMechanismEntityId' INTEGER NOT NULL, + 'N' INT (4) NOT NULL, + CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade +) +; + CREATE TABLE 'GrassCoverErosionInwardsCalculationEntity' ( 'GrassCoverErosionInwardsCalculationEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -458,14 +473,6 @@ ) ; -CREATE TABLE 'SoilProfileEntity' -( - 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'Bottom' REAL, - 'Name' TEXT -) -; - CREATE TABLE 'SoilLayerEntity' ( 'SoilLayerEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -486,6 +493,14 @@ ) ; +CREATE TABLE 'SoilProfileEntity' +( + 'SoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, + 'Bottom' REAL, + 'Name' TEXT +) +; + CREATE TABLE 'StochasticSoilProfileEntity' ( 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, @@ -546,6 +561,7 @@ 'UpliftZValue' REAL, 'SellmeijerFactorOfSafety' REAL, 'SellmeijerZValue' REAL, + 'UpliftEffectiveStress' REAL, 'HeaveGradient' REAL, 'SellmeijerCreepCoefficient' REAL, 'SellmeijerCriticalFall' REAL, @@ -1262,22 +1278,15 @@ ) ; -CREATE TABLE 'GrassCoverErosionInwardsDikeHeightOutputEntity' -( - 'GrassCoverErosionInwardsDikeHeightOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, - 'GrassCoverErosionInwardsOutputEntityId' INTEGER NOT NULL, - 'DikeHeight' REAL, - 'TargetProbability' REAL, - 'TargetReliability' REAL, - 'CalculatedProbability' REAL, - 'CalculatedReliability' REAL, - 'CalculationConvergence' TINYINT (1) NOT NULL, -- NotCalculated, CalculatedNotConverged or CalculatedConverged - CONSTRAINT 'FK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' FOREIGN KEY ('GrassCoverErosionInwardsOutputEntityId') REFERENCES 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsOutputEntityId') ON DELETE Cascade ON UPDATE Cascade, - CONSTRAINT 'U_GrassCoverErosionInwardsOutputEntity' UNIQUE ('GrassCoverErosionInwardsOutputEntityId') -) +/* Create Indexes and Triggers */ + +CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' + ON 'GrassCoverErosionInwardsDikeHeightOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -/* Create Indexes and Triggers */ +CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity' + ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) +; CREATE INDEX 'IXFK_StabilityPointStructuresCalculationEntity_CalculationGroupEntity' ON 'StabilityPointStructuresCalculationEntity' ('CalculationGroupEntityId' ASC) @@ -1295,14 +1304,6 @@ ON 'StabilityPointStructuresCalculationEntity' ('StabilityPointStructureEntityId' ASC) ; -CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - -CREATE INDEX 'IXFK_AssessmentSectionEntity_ProjectEntity' - ON 'AssessmentSectionEntity' ('ProjectEntityId' ASC) -; - CREATE INDEX 'IXFK_FailureMechanismSectionEntity_FailureMechanismEntity' ON 'FailureMechanismSectionEntity' ('FailureMechanismEntityId' ASC) ; @@ -1315,30 +1316,30 @@ ON 'FailureMechanismEntity' ('CalculationGroupEntityId' ASC) ; -CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_PipingFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'PipingFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; CREATE INDEX 'IXFK_ClosingStructureFailureMechanismMetaEntity_FailureMechanismEntity' ON 'ClosingStructureFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; -CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +CREATE INDEX 'IXFK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'StabilityPointStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) ; CREATE INDEX 'IXFK_CalculationGroupEntity_CalculationGroupEntity' ON 'CalculationGroupEntity' ('ParentCalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'HeightStructuresFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_HydraulicLocationEntity_AssessmentSectionEntity' ON 'HydraulicLocationEntity' ('AssessmentSectionEntityId' ASC) ; -CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' - ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) -; - CREATE INDEX 'IXFK_PipingCalculationEntity_StochasticSoilProfileEntity' ON 'PipingCalculationEntity' ('StochasticSoilProfileEntityId' ASC) ; @@ -1355,6 +1356,10 @@ ON 'PipingCalculationEntity' ('CalculationGroupEntityId' ASC) ; +CREATE INDEX 'IXFK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' + ON 'GrassCoverErosionInwardsFailureMechanismMetaEntity' ('FailureMechanismEntityId' ASC) +; + CREATE INDEX 'IXFK_GrassCoverErosionInwardsCalculationEntity_CalculationGroupEntity' ON 'GrassCoverErosionInwardsCalculationEntity' ('CalculationGroupEntityId' ASC) ; @@ -1614,7 +1619,3 @@ CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC) ; - -CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' - ON 'GrassCoverErosionInwardsDikeHeightOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) -; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DikeProfileEntity.cs (.../DikeProfileEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class DikeProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public DikeProfileEntity() { GrassCoverErosionInwardsCalculationEntities = new HashSet(); } - + public long DikeProfileEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } @@ -55,10 +54,9 @@ public Nullable Y { get; set; } public Nullable X0 { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs (.../DuneErosionSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DuneErosionSectionResultEntity.cs (.../DuneErosionSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class DuneErosionSectionResultEntity { public long DuneErosionSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismEntity.cs (.../FailureMechanismEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class FailureMechanismEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FailureMechanismEntity() { ClosingStructureEntities = new HashSet(); @@ -55,7 +54,7 @@ StochasticSoilModelEntities = new HashSet(); SurfaceLineEntities = new HashSet(); } - + public long FailureMechanismEntityId { get; set; } public long AssessmentSectionEntityId { get; set; } public Nullable CalculationGroupEntityId { get; set; } @@ -64,53 +63,38 @@ public string InputComments { get; set; } public string OutputComments { get; set; } public string NotRelevantComments { get; set; } - + public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructureFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DikeProfileEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FailureMechanismSectionEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ForeshoreProfileEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructureEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresFailureMechanismMetaEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilModelEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SurfaceLineEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/FailureMechanismSectionEntity.cs (.../FailureMechanismSectionEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,14 +28,14 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class FailureMechanismSectionEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FailureMechanismSectionEntity() { ClosingStructuresSectionResultEntities = new HashSet(); @@ -57,66 +57,48 @@ WaterPressureAsphaltCoverSectionResultEntities = new HashSet(); WaveImpactAsphaltCoverSectionResultEntities = new HashSet(); } - + public long FailureMechanismSectionEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public string FailureMechanismSectionPointXml { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DuneErosionSectionResultEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverSlipOffInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverSlipOffOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacrostabilityInwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MacrostabilityOutwardsSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection MicrostabilitySectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingStructureSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StrengthStabilityLengthwiseConstructionSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection TechnicalInnovationSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaterPressureAsphaltCoverSectionResultEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ForeshoreProfileEntity.cs (.../ForeshoreProfileEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ForeshoreProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ForeshoreProfileEntity() { ClosingStructuresCalculationEntities = new HashSet(); @@ -46,7 +45,7 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long ForeshoreProfileEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } @@ -58,25 +57,19 @@ public Nullable Y { get; set; } public Nullable X0 { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs =================================================================== diff -u -r064557819261426179042d10f40a25b3fc23aeec -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision 064557819261426179042d10f40a25b3fc23aeec) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsCalculationEntity.cs (.../GrassCoverErosionInwardsCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionInwardsCalculationEntity() { GrassCoverErosionInwardsOutputEntities = new HashSet(); GrassCoverErosionInwardsSectionResultEntities = new HashSet(); } - + public long GrassCoverErosionInwardsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable HydraulicLocationEntityId { get; set; } @@ -59,15 +58,13 @@ public byte UseBreakWater { get; set; } public short BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual DikeProfileEntity DikeProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsDikeHeightOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsDikeHeightOutputEntity.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsDikeHeightOutputEntity.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsDikeHeightOutputEntity { public long GrassCoverErosionInwardsDikeHeightOutputEntityId { get; set; } @@ -42,7 +43,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } - + public virtual GrassCoverErosionInwardsOutputEntity GrassCoverErosionInwardsOutputEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsFailureMechanismMetaEntity { public long GrassCoverErosionInwardsFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsOutputEntity.cs (.../GrassCoverErosionInwardsOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsOutputEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionInwardsOutputEntity() { GrassCoverErosionInwardsDikeHeightOutputEntities = new HashSet(); } - + public long GrassCoverErosionInwardsOutputEntityId { get; set; } public long GrassCoverErosionInwardsCalculationEntityId { get; set; } public int Order { get; set; } @@ -52,10 +51,9 @@ public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } - + public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsDikeHeightOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsSectionResultEntity.cs (.../GrassCoverErosionInwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionInwardsSectionResultEntity { public long GrassCoverErosionInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable GrassCoverErosionInwardsCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual GrassCoverErosionInwardsCalculationEntity GrassCoverErosionInwardsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsFailureMechanismMetaEntity { public long GrassCoverErosionOutwardsFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,35 +28,32 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsHydraulicLocationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionOutwardsHydraulicLocationEntity() { GrassCoverErosionOutwardsHydraulicLocationOutputEntities = new HashSet(); GrassCoverErosionOutwardsWaveConditionsCalculationEntities = new HashSet(); } - + public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public long LocationId { get; set; } public string Name { get; set; } public Nullable LocationX { get; set; } public Nullable LocationY { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsHydraulicLocationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs (.../GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,22 +28,23 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsHydraulicLocationOutputEntity { public long GrassCoverErosionOutwardsHydraulicLocationOutputEntityId { get; set; } public long GrassCoverErosionOutwardsHydraulicLocationEntityId { get; set; } - - public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } public byte HydraulicLocationOutputType { get; set; } public Nullable Result { get; set; } public Nullable TargetProbability { get; set; } public Nullable TargetReliability { get; set; } public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } + + public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs (.../GrassCoverErosionOutwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsSectionResultEntity.cs (.../GrassCoverErosionOutwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsSectionResultEntity { public long GrassCoverErosionOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrassCoverErosionOutwardsWaveConditionsCalculationEntity() { GrassCoverErosionOutwardsWaveConditionsOutputEntities = new HashSet(); } - + public long GrassCoverErosionOutwardsWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual GrassCoverErosionOutwardsHydraulicLocationEntity GrassCoverErosionOutwardsHydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionOutwardsWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverErosionOutwardsWaveConditionsOutputEntity { public long GrassCoverErosionOutwardsWaveConditionsOutputEntityId { get; set; } @@ -47,7 +48,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } - + public virtual GrassCoverErosionOutwardsWaveConditionsCalculationEntity GrassCoverErosionOutwardsWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs (.../GrassCoverSlipOffInwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffInwardsSectionResultEntity.cs (.../GrassCoverSlipOffInwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverSlipOffInwardsSectionResultEntity { public long GrassCoverSlipOffInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs (.../GrassCoverSlipOffOutwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverSlipOffOutwardsSectionResultEntity.cs (.../GrassCoverSlipOffOutwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class GrassCoverSlipOffOutwardsSectionResultEntity { public long GrassCoverSlipOffOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructureEntity.cs (.../HeightStructureEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HeightStructureEntity() { HeightStructuresCalculationEntities = new HashSet(); } - + public long HeightStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -63,10 +62,9 @@ public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } public Nullable AllowedLevelIncreaseStorageMean { get; set; } public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HeightStructuresCalculationEntity() { HeightStructuresOutputEntities = new HashSet(); HeightStructuresSectionResultEntities = new HashSet(); } - + public long HeightStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable HydraulicLocationEntityId { get; set; } @@ -51,19 +50,6 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } - public Nullable LevelCrestStructureMean { get; set; } - public Nullable LevelCrestStructureStandardDeviation { get; set; } - public Nullable DeviationWaveDirection { get; set; } - - public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } - public virtual HeightStructureEntity HeightStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection HeightStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection HeightStructuresSectionResultEntities { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } public Nullable StructureNormalOrientation { get; set; } public Nullable AllowedLevelIncreaseStorageMean { get; set; } @@ -78,11 +64,21 @@ public Nullable WidthFlowAperturesMean { get; set; } public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable StormDurationMean { get; set; } + public Nullable LevelCrestStructureMean { get; set; } + public Nullable LevelCrestStructureStandardDeviation { get; set; } + public Nullable DeviationWaveDirection { get; set; } public byte UseBreakWater { get; set; } public byte UseForeshore { get; set; } public short BreakWaterType { get; set; } public Nullable BreakWaterHeight { get; set; } + + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + public virtual HeightStructureEntity HeightStructureEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructuresOutputEntities { get; set; } + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection HeightStructuresSectionResultEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresFailureMechanismMetaEntity { public long HeightStructuresFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresOutputEntity.cs (.../HeightStructuresOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresOutputEntity { public long HeightStructuresOutputEntityId { get; set; } public long HeightStructuresCalculationEntityId { get; set; } - - public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresSectionResultEntity.cs (.../HeightStructuresSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HeightStructuresSectionResultEntity { public long HeightStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable HeightStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual HeightStructuresCalculationEntity HeightStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs (.../HydraulicLocationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,15 +28,14 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HydraulicLocationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public HydraulicLocationEntity() { ClosingStructuresCalculationEntities = new HashSet(); @@ -48,39 +47,31 @@ StabilityStoneCoverWaveConditionsCalculationEntities = new HashSet(); WaveImpactAsphaltCoverWaveConditionsCalculationEntities = new HashSet(); } - + public long HydraulicLocationEntityId { get; set; } public long AssessmentSectionEntityId { get; set; } public long LocationId { get; set; } public string Name { get; set; } public Nullable LocationX { get; set; } public Nullable LocationY { get; set; } public int Order { get; set; } - + public virtual AssessmentSectionEntity AssessmentSectionEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection ClosingStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection GrassCoverErosionInwardsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HeightStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection HydraulicLocationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsCalculationEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs (.../HydraulicLocationOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,22 +28,23 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class HydraulicLocationOutputEntity { public long HydraulicLocationEntityOutputId { get; set; } public long HydraulicLocationEntityId { get; set; } - - public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public byte HydraulicLocationOutputType { get; set; } public Nullable Result { get; set; } public Nullable TargetProbability { get; set; } public Nullable TargetReliability { get; set; } public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } + + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs (.../MacrostabilityInwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityInwardsSectionResultEntity.cs (.../MacrostabilityInwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MacrostabilityInwardsSectionResultEntity { public long MacrostabilityInwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs (.../MacrostabilityOutwardsSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacrostabilityOutwardsSectionResultEntity.cs (.../MacrostabilityOutwardsSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MacrostabilityOutwardsSectionResultEntity { public long MacrostabilityOutwardsSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs (.../MicrostabilitySectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MicrostabilitySectionResultEntity.cs (.../MicrostabilitySectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class MicrostabilitySectionResultEntity { public long MicrostabilitySectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public PipingCalculationEntity() { PipingCalculationOutputEntities = new HashSet(); PipingSemiProbabilisticOutputEntities = new HashSet(); } - + public long PipingCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable SurfaceLineEntityId { get; set; } @@ -61,16 +60,14 @@ public Nullable ScenarioContribution { get; set; } public Nullable AssessmentLevel { get; set; } public byte UseAssessmentLevelManualInput { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual SurfaceLineEntity SurfaceLineEntity { get; set; } public virtual StochasticSoilProfileEntity StochasticSoilProfileEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingSemiProbabilisticOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationOutputEntity.cs (.../PipingCalculationOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingCalculationOutputEntity { public long PipingCalculationOutputEntityId { get; set; } @@ -43,11 +44,12 @@ public Nullable UpliftZValue { get; set; } public Nullable SellmeijerFactorOfSafety { get; set; } public Nullable SellmeijerZValue { get; set; } + public Nullable UpliftEffectiveStress { get; set; } public Nullable HeaveGradient { get; set; } public Nullable SellmeijerCreepCoefficient { get; set; } public Nullable SellmeijerCriticalFall { get; set; } public Nullable SellmeijerReducedFall { get; set; } - + public virtual PipingCalculationEntity PipingCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingFailureMechanismMetaEntity.cs (.../PipingFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,13 +30,16 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingFailureMechanismMetaEntity { public long PipingFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public double A { get; set; } public double WaterVolumetricWeight { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSectionResultEntity.cs (.../PipingSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingSectionResultEntity { public long PipingSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingSemiProbabilisticOutputEntity { public long PipingSemiProbabilisticOutputEntityId { get; set; } @@ -51,7 +52,7 @@ public Nullable PipingProbability { get; set; } public Nullable PipingReliability { get; set; } public Nullable PipingFactorOfSafety { get; set; } - + public virtual PipingCalculationEntity PipingCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs (.../PipingStructureSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingStructureSectionResultEntity.cs (.../PipingStructureSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class PipingStructureSectionResultEntity { public long PipingStructureSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/ProjectEntity.cs (.../ProjectEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,23 +28,23 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class ProjectEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ProjectEntity() { AssessmentSectionEntities = new HashSet(); } - + public long ProjectEntityId { get; set; } public string Description { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection AssessmentSectionEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs (.../RingtoetsEntities.Context.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -98,7 +98,7 @@ public virtual DbSet WaveImpactAsphaltCoverSectionResultEntities { get; set; } public virtual DbSet WaveImpactAsphaltCoverWaveConditionsCalculationEntities { get; set; } public virtual DbSet WaveImpactAsphaltCoverWaveConditionsOutputEntities { get; set; } - + /// /// This method is called in a 'code first' approach when the model for a derived has been initialized, /// but before the model has been locked down and used to initialize the . Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -// 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:\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 -r064557819261426179042d10f40a25b3fc23aeec -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 064557819261426179042d10f40a25b3fc23aeec) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -4,7 +4,7 @@ - + @@ -574,6 +574,7 @@ + @@ -3540,6 +3541,7 @@ + @@ -5637,6 +5639,7 @@ + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r064557819261426179042d10f40a25b3fc23aeec -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 064557819261426179042d10f40a25b3fc23aeec) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -5,69 +5,69 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs (.../SoilLayerEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilLayerEntity.cs (.../SoilLayerEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SoilLayerEntity { public long SoilLayerEntityId { get; set; } @@ -48,7 +49,7 @@ public Nullable PermeabilityMean { get; set; } public Nullable PermeabilityDeviation { get; set; } public int Order { get; set; } - + public virtual SoilProfileEntity SoilProfileEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs (.../SoilProfileEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SoilProfileEntity.cs (.../SoilProfileEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,29 +28,27 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SoilProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SoilProfileEntity() { SoilLayerEntities = new HashSet(); StochasticSoilProfileEntities = new HashSet(); } - + public long SoilProfileEntityId { get; set; } public Nullable Bottom { get; set; } public string Name { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection SoilLayerEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilProfileEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructureEntity.cs (.../StabilityPointStructureEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructureEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityPointStructureEntity() { StabilityPointStructuresCalculationEntities = new HashSet(); } - + public long StabilityPointStructureEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int Order { get; set; } @@ -94,10 +93,9 @@ public Nullable AreaFlowAperturesMean { get; set; } public Nullable AreaFlowAperturesStandardDeviation { get; set; } public byte InflowModelType { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,21 +28,20 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityPointStructuresCalculationEntity() { StabilityPointStructuresOutputEntities = new HashSet(); StabilityPointStructuresSectionResultEntities = new HashSet(); } - + public long StabilityPointStructuresCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -51,10 +50,25 @@ public int Order { get; set; } public string Name { get; set; } public string Comments { get; set; } + public byte UseBreakWater { get; set; } + public short BreakWaterType { get; set; } + public Nullable BreakWaterHeight { get; set; } + public byte UseForeshore { get; set; } + public Nullable StructureNormalOrientation { get; set; } + public Nullable StorageStructureAreaMean { get; set; } + public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } + public Nullable AllowedLevelIncreaseStorageMean { get; set; } + public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } + public Nullable WidthFlowAperturesMean { get; set; } + public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable InsideWaterLevelMean { get; set; } public Nullable InsideWaterLevelStandardDeviation { get; set; } public Nullable ThresholdHeightOpenWeirMean { get; set; } public Nullable ThresholdHeightOpenWeirStandardDeviation { get; set; } + public Nullable CriticalOvertoppingDischargeMean { get; set; } + public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } + public Nullable FlowWidthAtBottomProtectionMean { get; set; } + public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } public Nullable ConstructiveStrengthLinearLoadModelMean { get; set; } public Nullable ConstructiveStrengthLinearLoadModelCoefficientOfVariation { get; set; } public Nullable ConstructiveStrengthQuadraticLoadModelMean { get; set; } @@ -87,37 +101,19 @@ public byte InflowModelType { get; set; } public byte LoadSchematizationType { get; set; } public Nullable VolumicWeightWater { get; set; } + public Nullable StormDurationMean { get; set; } + public Nullable ModelFactorSuperCriticalFlowMean { get; set; } public Nullable FactorStormDurationOpenStructure { get; set; } public Nullable DrainCoefficientMean { get; set; } - + public double FailureProbabilityStructureWithErosion { get; set; } + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } + public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } + public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } public virtual StabilityPointStructureEntity StabilityPointStructureEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresOutputEntities { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - - public byte UseBreakWater { get; set; } - public short BreakWaterType { get; set; } - public Nullable BreakWaterHeight { get; set; } - public byte UseForeshore { get; set; } - public Nullable StructureNormalOrientation { get; set; } - public Nullable StorageStructureAreaMean { get; set; } - public Nullable StorageStructureAreaCoefficientOfVariation { get; set; } - public Nullable AllowedLevelIncreaseStorageMean { get; set; } - public Nullable AllowedLevelIncreaseStorageStandardDeviation { get; set; } - public Nullable WidthFlowAperturesMean { get; set; } - public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } - public Nullable CriticalOvertoppingDischargeMean { get; set; } - public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } - public Nullable FlowWidthAtBottomProtectionMean { get; set; } - public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } - public Nullable StormDurationMean { get; set; } - public Nullable ModelFactorSuperCriticalFlowMean { get; set; } - public double FailureProbabilityStructureWithErosion { get; set; } - public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } - public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -30,12 +30,15 @@ namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresFailureMechanismMetaEntity { public long StrengthStabilityPointConstructionFailureMechanismMetaEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public int N { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresOutputEntity.cs (.../StabilityPointStructuresOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,21 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresOutputEntity { public long StabilityPointStructuresOutputEntity1 { get; set; } public long StabilityPointStructuresCalculationEntityId { get; set; } - - public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } public Nullable RequiredProbability { get; set; } public Nullable RequiredReliability { get; set; } public Nullable Probability { get; set; } public Nullable Reliability { get; set; } public Nullable FactorOfSafety { get; set; } + + public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,19 +28,20 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityPointStructuresSectionResultEntity { public long StabilityPointStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public Nullable StabilityPointStructuresCalculationEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs (.../StabilityStoneCoverSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverSectionResultEntity.cs (.../StabilityStoneCoverSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverSectionResultEntity { public long StabilityStoneCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsCalculationEntity.cs (.../StabilityStoneCoverWaveConditionsCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StabilityStoneCoverWaveConditionsCalculationEntity() { StabilityStoneCoverWaveConditionsOutputEntities = new HashSet(); } - + public long StabilityStoneCoverWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityStoneCoverWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverWaveConditionsOutputEntity.cs (.../StabilityStoneCoverWaveConditionsOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StabilityStoneCoverWaveConditionsOutputEntity { public long StabilityStoneCoverWaveConditionsOutputEntityId { get; set; } @@ -48,7 +49,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } - + public virtual StabilityStoneCoverWaveConditionsCalculationEntity StabilityStoneCoverWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs (.../StochasticSoilModelEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilModelEntity.cs (.../StochasticSoilModelEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,29 +28,28 @@ // //------------------------------------------------------------------------------ -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StochasticSoilModelEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StochasticSoilModelEntity() { StochasticSoilProfileEntities = new HashSet(); } - + public long StochasticSoilModelEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public string SegmentName { get; set; } public string StochasticSoilModelSegmentPointXml { get; set; } public int Order { get; set; } - + public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StochasticSoilProfileEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,30 +28,28 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StochasticSoilProfileEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public StochasticSoilProfileEntity() { PipingCalculationEntities = new HashSet(); } - + public long StochasticSoilProfileEntityId { get; set; } public long SoilProfileEntityId { get; set; } public long StochasticSoilModelEntityId { get; set; } public Nullable Probability { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } - public virtual SoilProfileEntity SoilProfileEntity { get; set; } public virtual StochasticSoilModelEntity StochasticSoilModelEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StrengthStabilityLengthwiseConstructionSectionResultEntity.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class StrengthStabilityLengthwiseConstructionSectionResultEntity { public long StrengthStabilityLengthwiseConstructionSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/SurfaceLineEntity.cs (.../SurfaceLineEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,35 +28,32 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class SurfaceLineEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SurfaceLineEntity() { CharacteristicPointEntities = new HashSet(); PipingCalculationEntities = new HashSet(); } - + public long SurfaceLineEntityId { get; set; } public long FailureMechanismEntityId { get; set; } public string Name { get; set; } public Nullable ReferenceLineIntersectionX { get; set; } public Nullable ReferenceLineIntersectionY { get; set; } public string PointsXml { get; set; } public int Order { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection CharacteristicPointEntities { get; set; } - public virtual FailureMechanismEntity FailureMechanismEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection PipingCalculationEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs (.../TechnicalInnovationSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TechnicalInnovationSectionResultEntity.cs (.../TechnicalInnovationSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class TechnicalInnovationSectionResultEntity { public long TechnicalInnovationSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs (.../VersionEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/VersionEntity.cs (.../VersionEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,15 +28,16 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class VersionEntity { public long VersionId { get; set; } public long Version { get; set; } - public DateTime Timestamp { get; set; } + public System.DateTime Timestamp { get; set; } public byte[] FingerPrint { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs (.../WaterPressureAsphaltCoverSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaterPressureAsphaltCoverSectionResultEntity.cs (.../WaterPressureAsphaltCoverSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,17 +28,18 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaterPressureAsphaltCoverSectionResultEntity { public long WaterPressureAsphaltCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs (.../WaveImpactAsphaltCoverSectionResultEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverSectionResultEntity.cs (.../WaveImpactAsphaltCoverSectionResultEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,18 +28,19 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverSectionResultEntity { public long WaveImpactAsphaltCoverSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } public byte LayerOne { get; set; } public byte LayerTwoA { get; set; } public Nullable LayerThree { get; set; } - + public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,20 +28,19 @@ // //------------------------------------------------------------------------------ -using System; -using System.Collections.Generic; -using System.Diagnostics.CodeAnalysis; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverWaveConditionsCalculationEntity { - [SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public WaveImpactAsphaltCoverWaveConditionsCalculationEntity() { WaveImpactAsphaltCoverWaveConditionsOutputEntities = new HashSet(); } - + public long WaveImpactAsphaltCoverWaveConditionsCalculationEntityId { get; set; } public long CalculationGroupEntityId { get; set; } public Nullable ForeshoreProfileEntityId { get; set; } @@ -59,12 +58,11 @@ public Nullable UpperBoundaryWaterLevels { get; set; } public Nullable LowerBoundaryWaterLevels { get; set; } public byte StepSize { get; set; } - + public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual ForeshoreProfileEntity ForeshoreProfileEntity { get; set; } public virtual HydraulicLocationEntity HydraulicLocationEntity { get; set; } - - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection WaveImpactAsphaltCoverWaveConditionsOutputEntities { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs =================================================================== diff -u -re373ac64cdd9a13f54849ee0e502f60d3130dc78 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs) (revision e373ac64cdd9a13f54849ee0e502f60d3130dc78) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputEntity.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -28,10 +28,11 @@ // //------------------------------------------------------------------------------ -using System; - namespace Application.Ringtoets.Storage.DbContext { + using System; + using System.Collections.Generic; + public partial class WaveImpactAsphaltCoverWaveConditionsOutputEntity { public long WaveImpactAsphaltCoverWaveConditionsOutputEntityId { get; set; } @@ -47,7 +48,7 @@ public Nullable CalculatedProbability { get; set; } public Nullable CalculatedReliability { get; set; } public byte CalculationConvergence { get; set; } - + public virtual WaveImpactAsphaltCoverWaveConditionsCalculationEntity WaveImpactAsphaltCoverWaveConditionsCalculationEntity { get; set; } } -} \ No newline at end of file +} Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs =================================================================== diff -u -rd7ac6da9fa00d17a03d6912000c889172bbf12ad -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs (.../PipingCalculationOutputEntityReadExtensions.cs) (revision d7ac6da9fa00d17a03d6912000c889172bbf12ad) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationOutputEntityReadExtensions.cs (.../PipingCalculationOutputEntityReadExtensions.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -47,6 +47,7 @@ HeaveFactorOfSafety = entity.HeaveFactorOfSafety.ToNullAsNaN(), SellmeijerZValue = entity.SellmeijerZValue.ToNullAsNaN(), SellmeijerFactorOfSafety = entity.SellmeijerFactorOfSafety.ToNullAsNaN(), + UpliftEffectiveStress = entity.UpliftEffectiveStress.ToNullAsNaN(), HeaveGradient = entity.HeaveGradient.ToNullAsNaN(), SellmeijerCreepCoefficient = entity.SellmeijerCreepCoefficient.ToNullAsNaN(), SellmeijerCriticalFall = entity.SellmeijerCriticalFall.ToNullAsNaN(), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs =================================================================== diff -u -rd7ac6da9fa00d17a03d6912000c889172bbf12ad -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision d7ac6da9fa00d17a03d6912000c889172bbf12ad) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingOutputCreateExtensionsTest.cs (.../PipingOutputCreateExtensionsTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -41,10 +41,11 @@ HeaveFactorOfSafety = 4.4, SellmeijerZValue = 5.5, SellmeijerFactorOfSafety = 6.6, - HeaveGradient = 7.7, - SellmeijerCreepCoefficient = 8.8, - SellmeijerCriticalFall = 9.9, - SellmeijerReducedFall = 10.10 + UpliftEffectiveStress = 7.7, + HeaveGradient = 8.8, + SellmeijerCreepCoefficient = 9.9, + SellmeijerCriticalFall = 10.10, + SellmeijerReducedFall = 11.11 }); // Call @@ -57,6 +58,7 @@ Assert.AreEqual(pipingOutput.SellmeijerZValue, entity.SellmeijerZValue); Assert.AreEqual(pipingOutput.UpliftFactorOfSafety, entity.UpliftFactorOfSafety); Assert.AreEqual(pipingOutput.UpliftZValue, entity.UpliftZValue); + Assert.AreEqual(pipingOutput.UpliftEffectiveStress.Value, entity.UpliftEffectiveStress); Assert.AreEqual(pipingOutput.HeaveGradient.Value, entity.HeaveGradient); Assert.AreEqual(pipingOutput.SellmeijerCreepCoefficient.Value, entity.SellmeijerCreepCoefficient); Assert.AreEqual(pipingOutput.SellmeijerCriticalFall.Value, entity.SellmeijerCriticalFall); @@ -82,6 +84,7 @@ Assert.IsNull(entity.SellmeijerZValue); Assert.IsNull(entity.UpliftFactorOfSafety); Assert.IsNull(entity.UpliftZValue); + Assert.IsNull(entity.UpliftEffectiveStress); Assert.IsNull(entity.HeaveGradient); Assert.IsNull(entity.SellmeijerCreepCoefficient); Assert.IsNull(entity.SellmeijerCriticalFall); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r28fb1b160a865640e7a069cb594862563e18add5 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs (.../PipingCalculationOutputEntityReadExtensionsTest.cs) (revision 28fb1b160a865640e7a069cb594862563e18add5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs (.../PipingCalculationOutputEntityReadExtensionsTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -41,6 +41,7 @@ UpliftFactorOfSafety = 3.2, SellmeijerZValue = 1.9, SellmeijerFactorOfSafety = 8.7, + UpliftEffectiveStress = 15.2, HeaveGradient = 12.2, SellmeijerCreepCoefficient = 1.4, SellmeijerCriticalFall = 6.2, @@ -57,6 +58,7 @@ Assert.AreEqual(entity.SellmeijerZValue, output.SellmeijerZValue); Assert.AreEqual(entity.UpliftZValue, output.UpliftZValue); Assert.AreEqual(entity.UpliftFactorOfSafety, output.UpliftFactorOfSafety); + Assert.AreEqual(entity.UpliftEffectiveStress, output.UpliftEffectiveStress.Value); Assert.AreEqual(entity.HeaveGradient, output.HeaveGradient.Value); Assert.AreEqual(entity.SellmeijerCreepCoefficient, output.SellmeijerCreepCoefficient.Value); Assert.AreEqual(entity.SellmeijerCriticalFall, output.SellmeijerCriticalFall.Value); @@ -75,6 +77,7 @@ UpliftFactorOfSafety = null, SellmeijerZValue = null, SellmeijerFactorOfSafety = null, + UpliftEffectiveStress = null, HeaveGradient = null, SellmeijerCreepCoefficient = null, SellmeijerCriticalFall = null, @@ -91,6 +94,7 @@ Assert.IsNaN(output.SellmeijerZValue); Assert.IsNaN(output.UpliftZValue); Assert.IsNaN(output.UpliftFactorOfSafety); + Assert.IsNaN(output.UpliftEffectiveStress); Assert.IsNaN(output.HeaveGradient); Assert.IsNaN(output.SellmeijerCreepCoefficient); Assert.IsNaN(output.SellmeijerCriticalFall); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs (.../PipingOutput.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingOutput.cs (.../PipingOutput.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -50,59 +50,65 @@ UpliftZValue = constructionProperties.UpliftZValue; SellmeijerFactorOfSafety = constructionProperties.SellmeijerFactorOfSafety; SellmeijerZValue = constructionProperties.SellmeijerZValue; + UpliftEffectiveStress = new RoundedDouble(2, constructionProperties.UpliftEffectiveStress); HeaveGradient = new RoundedDouble(2, constructionProperties.HeaveGradient); SellmeijerCreepCoefficient = new RoundedDouble(1, constructionProperties.SellmeijerCreepCoefficient); SellmeijerCriticalFall = new RoundedDouble(2, constructionProperties.SellmeijerCriticalFall); SellmeijerReducedFall = new RoundedDouble(2, constructionProperties.SellmeijerReducedFall); } /// - /// The calculated z-value for the uplift sub calculation. + /// Gets the calculated z-value for the uplift sub calculation. /// public double UpliftZValue { get; private set; } /// - /// The factor of safety for the uplift sub calculation. + /// Gets the factor of safety for the uplift sub calculation. /// public double UpliftFactorOfSafety { get; private set; } /// - /// The calculated z-value for the heave sub calculation. + /// Gets the calculated z-value for the heave sub calculation. /// public double HeaveZValue { get; private set; } /// - /// The factor of safety for the heave sub calculation. + /// Gets the factor of safety for the heave sub calculation. /// public double HeaveFactorOfSafety { get; private set; } /// - /// The calculated z-value for the Sellmeijer sub calculation. + /// Gets the calculated z-value for the Sellmeijer sub calculation. /// public double SellmeijerZValue { get; private set; } /// - /// The factor of safety for the Sellmeijer sub calculation. + /// Gets the factor of safety for the Sellmeijer sub calculation. /// public double SellmeijerFactorOfSafety { get; private set; } /// - /// The gradient that was calculated for the heave sub calculation. + /// Gets the effective stress that was calculated for the uplift sub calculation. /// + public RoundedDouble UpliftEffectiveStress { get; private set; } + + /// + /// Gets the gradient that was calculated for the heave sub calculation. + /// public RoundedDouble HeaveGradient { get; private set; } /// - /// The creep coefficient that was calculated for the Sellmeijer sub calculation. + /// Gets the creep coefficient that was calculated for the Sellmeijer sub calculation. /// public RoundedDouble SellmeijerCreepCoefficient { get; private set; } /// - /// The critical fall that was calculated for the Sellmeijer sub calculation. + /// Gets the critical fall that was calculated for the Sellmeijer sub calculation. /// public RoundedDouble SellmeijerCriticalFall { get; private set; } /// - /// The reduced fall that was calculated for the Sellmeijer sub calculation. + /// Gets the reduced fall that was calculated for the Sellmeijer sub calculation. /// public RoundedDouble SellmeijerReducedFall { get; private set; } @@ -122,59 +128,65 @@ HeaveFactorOfSafety = double.NaN; SellmeijerZValue = double.NaN; SellmeijerFactorOfSafety = double.NaN; + UpliftEffectiveStress = double.NaN; HeaveGradient = double.NaN; SellmeijerCreepCoefficient = double.NaN; SellmeijerCriticalFall = double.NaN; SellmeijerReducedFall = double.NaN; } /// - /// The calculated z-value for the uplift sub calculation. + /// Sets the calculated z-value for the uplift sub calculation. /// public double UpliftZValue { internal get; set; } /// - /// The factor of safety for the uplift sub calculation. + /// Sets the factor of safety for the uplift sub calculation. /// public double UpliftFactorOfSafety { internal get; set; } /// - /// The calculated z-value for the heave sub calculation. + /// Sets the calculated z-value for the heave sub calculation. /// public double HeaveZValue { internal get; set; } /// - /// The factor of safety for the heave sub calculation. + /// Sets the factor of safety for the heave sub calculation. /// public double HeaveFactorOfSafety { internal get; set; } /// - /// The calculated z-value for the Sellmeijer sub calculation. + /// Sets the calculated z-value for the Sellmeijer sub calculation. /// public double SellmeijerZValue { internal get; set; } /// - /// The factor of safety for the Sellmeijer sub calculation. + /// Sets the factor of safety for the Sellmeijer sub calculation. /// public double SellmeijerFactorOfSafety { internal get; set; } /// - /// The gradient that was calculated for the heave sub calculation. + /// Gets the effective stress that was calculated for the uplift sub calculation. /// + public double UpliftEffectiveStress { internal get; set; } + + /// + /// Sets the gradient that was calculated for the heave sub calculation. + /// public double HeaveGradient { internal get; set; } /// - /// The creep coefficient that was calculated for the Sellmeijer sub calculation. + /// Sets the creep coefficient that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCreepCoefficient { internal get; set; } /// - /// The critical fall that was calculated for the Sellmeijer sub calculation. + /// Sets the critical fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCriticalFall { internal get; set; } /// - /// The reduced fall that was calculated for the Sellmeijer sub calculation. + /// Sets the reduced fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerReducedFall { internal get; set; } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs =================================================================== diff -u -rec79baa6789a55510eea80494f5ff91f293f77b2 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision ec79baa6789a55510eea80494f5ff91f293f77b2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticDesignValueFactory.cs (.../PipingSemiProbabilisticDesignValueFactory.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -56,6 +56,10 @@ /// public static DesignVariable GetSaturatedVolumicWeightOfCoverageLayer(PipingInput parameters) { + if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean)) + { + return CreateDeterministicDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0); + } return CreateDesignVariable(parameters.SaturatedVolumicWeightOfCoverageLayer, 0.05); } @@ -76,7 +80,7 @@ /// public static DesignVariable GetEffectiveThicknessCoverageLayer(PipingInput parameters) { - if (double.IsNaN(parameters.EffectiveThicknessCoverageLayer.Mean)) + if (double.IsNaN(parameters.ThicknessCoverageLayer.Mean)) { return CreateDeterministicDesignVariable(parameters.EffectiveThicknessCoverageLayer, 0); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU 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 General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -1086,6 +1065,24 @@ } /// + /// Looks up a localized string similar to Het effectieve gewicht van de deklaag.. + /// + public static string PipingOutputContext_UpliftEffectiveStress_Description { + get { + return ResourceManager.GetString("PipingOutputContext_UpliftEffectiveStress_Description", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Gewicht van de deklaag [kN/m²]. + /// + public static string PipingOutputContext_UpliftEffectiveStress_DisplayName { + get { + return ResourceManager.GetString("PipingOutputContext_UpliftEffectiveStress_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De veiligheidsfactor voor het submechanisme opbarsten voor deze berekening.. /// public static string PipingOutputContext_UpliftFactorOfSafety_Description { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rb7563238aa805cb6207e948a97f6fcc9e52c92b2 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision b7563238aa805cb6207e948a97f6fcc9e52c92b2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -613,4 +613,10 @@ Handmatig toetspeil invoeren + + Het effectieve gewicht van de deklaag. + + + Gewicht van de deklaag [kN/m²] + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs =================================================================== diff -u -r76095f14a847cd54fd958c5b326f7eb903dfd456 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision 76095f14a847cd54fd958c5b326f7eb903dfd456) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputContextProperties.cs (.../PipingOutputContextProperties.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -33,9 +33,21 @@ public class PipingOutputContextProperties : ObjectProperties { [ResourcesCategory(typeof(Resources), "PipingOutputContext_Categories_Uplift", 1, 4)] + [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_UpliftEffectiveStress_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingOutputContext_UpliftEffectiveStress_Description")] + [PropertyOrder(1)] + public RoundedDouble UpliftEffectiveStress + { + get + { + return data.WrappedData.UpliftEffectiveStress; + } + } + + [ResourcesCategory(typeof(Resources), "PipingOutputContext_Categories_Uplift", 1, 4)] [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_UpliftFactorOfSafety_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingOutputContext_UpliftFactorOfSafety_Description")] - [PropertyOrder(1)] + [PropertyOrder(2)] public RoundedDouble UpliftFactorOfSafety { get @@ -47,7 +59,7 @@ [ResourcesCategory(typeof(Resources), "PipingOutputContext_Categories_Uplift", 1, 4)] [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_UpliftReliability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingOutputContext_UpliftReliability_Description")] - [PropertyOrder(2)] + [PropertyOrder(3)] public RoundedDouble UpliftReliability { get @@ -59,7 +71,7 @@ [ResourcesCategory(typeof(Resources), "PipingOutputContext_Categories_Uplift", 1, 4)] [ResourcesDisplayName(typeof(Resources), "PipingOutputContext_UpliftProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingOutputContext_UpliftProbability_Description")] - [PropertyOrder(3)] + [PropertyOrder(4)] public string UpliftProbability { get Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -re60dbf2fd41434270cad4efba20446e19ede0d2e -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision e60dbf2fd41434270cad4efba20446e19ede0d2e) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -81,6 +81,7 @@ HeaveFactorOfSafety = heaveResult.FoSh, SellmeijerZValue = sellmeijerResult.Zp, SellmeijerFactorOfSafety = sellmeijerResult.FoSp, + UpliftEffectiveStress = upliftResult.EffectiveStress, HeaveGradient = heaveResult.Gradient, SellmeijerCreepCoefficient = sellmeijerResult.CreepCoefficient, SellmeijerCriticalFall = sellmeijerResult.CriticalFall, Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs (.../PipingCalculatorResult.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs (.../PipingCalculatorResult.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -47,6 +47,7 @@ HeaveFactorOfSafety = constructionProperties.HeaveFactorOfSafety; SellmeijerZValue = constructionProperties.SellmeijerZValue; SellmeijerFactorOfSafety = constructionProperties.SellmeijerFactorOfSafety; + UpliftEffectiveStress = constructionProperties.UpliftEffectiveStress; HeaveGradient = constructionProperties.HeaveGradient; SellmeijerCreepCoefficient = constructionProperties.SellmeijerCreepCoefficient; SellmeijerCriticalFall = constructionProperties.SellmeijerCriticalFall; @@ -69,59 +70,65 @@ HeaveFactorOfSafety = double.NaN; SellmeijerZValue = double.NaN; SellmeijerFactorOfSafety = double.NaN; + UpliftEffectiveStress = double.NaN; HeaveGradient = double.NaN; SellmeijerCreepCoefficient = double.NaN; SellmeijerCriticalFall = double.NaN; SellmeijerReducedFall = double.NaN; } /// - /// Gets the z-value of the Uplift sub calculation. + /// Sets the z-value of the Uplift sub calculation. /// public double UpliftZValue { internal get; set; } /// - /// Gets the factory of safety of the Uplift sub calculation. + /// Sets the factor of safety of the Uplift sub calculation. /// public double UpliftFactorOfSafety { internal get; set; } /// - /// Gets the z-value of the Heave sub calculation. + /// Sets the z-value of the Heave sub calculation. /// public double HeaveZValue { internal get; set; } /// - /// Gets the factory of safety of the Heave sub calculation. + /// Sets the factor of safety of the Heave sub calculation. /// public double HeaveFactorOfSafety { internal get; set; } /// - /// Gets the z-value of the Sellmeijer sub calculation. + /// Sets the z-value of the Sellmeijer sub calculation. /// public double SellmeijerZValue { internal get; set; } /// - /// Gets the factory of safety of the Sellmeijer sub calculation. + /// Sets the factor of safety of the Sellmeijer sub calculation. /// public double SellmeijerFactorOfSafety { internal get; set; } /// - /// The gradient that was calculated for the heave sub calculation. + /// Sets the effective stress that was calculated for the uplift sub calculation. /// + public double UpliftEffectiveStress { internal get; set; } + + /// + /// Sets the gradient that was calculated for the heave sub calculation. + /// public double HeaveGradient { internal get; set; } /// - /// The creep coefficient that was calculated for the Sellmeijer sub calculation. + /// Sets the creep coefficient that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCreepCoefficient { internal get; set; } /// - /// The critical fall that was calculated for the Sellmeijer sub calculation. + /// Sets the critical fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCriticalFall { internal get; set; } /// - /// The reduced fall that was calculated for the Sellmeijer sub calculation. + /// Sets the reduced fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerReducedFall { internal get; set; } } @@ -134,7 +141,7 @@ public double UpliftZValue { get; private set; } /// - /// Gets the factory of safety of the Uplift sub calculation. + /// Gets the factor of safety of the Uplift sub calculation. /// public double UpliftFactorOfSafety { get; private set; } @@ -144,7 +151,7 @@ public double HeaveZValue { get; private set; } /// - /// Gets the factory of safety of the Heave sub calculation. + /// Gets the factor of safety of the Heave sub calculation. /// public double HeaveFactorOfSafety { get; private set; } @@ -154,27 +161,32 @@ public double SellmeijerZValue { get; private set; } /// - /// Gets the factory of safety of the Sellmeijer sub calculation. + /// Gets the factor of safety of the Sellmeijer sub calculation. /// public double SellmeijerFactorOfSafety { get; private set; } /// - /// The gradient that was calculated for the heave sub calculation. + /// Gets the effective stress that was calculated for the uplift sub calculation. /// + public double UpliftEffectiveStress { get; private set; } + + /// + /// Gets the gradient that was calculated for the heave sub calculation. + /// public double HeaveGradient { get; private set; } /// - /// The creep coefficient that was calculated for the Sellmeijer sub calculation. + /// Gets the creep coefficient that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCreepCoefficient { get; private set; } /// - /// The critical fall that was calculated for the Sellmeijer sub calculation. + /// Gets the critical fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerCriticalFall { get; private set; } /// - /// The reduced fall that was calculated for the Sellmeijer sub calculation. + /// Gets the reduced fall that was calculated for the Sellmeijer sub calculation. /// public double SellmeijerReducedFall { get; private set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs =================================================================== diff -u -r11442d016c7154e924e51d58d948752a1221f27a -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs (.../IUpliftCalculator.cs) (revision 11442d016c7154e924e51d58d948752a1221f27a) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs (.../IUpliftCalculator.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -31,7 +31,7 @@ /// /// Sets the effective stress. /// - double EffectiveStress { set; } + double EffectiveStress { get; set; } /// /// Sets the phreatic level at the exit point. Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs =================================================================== diff -u -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -41,6 +41,10 @@ public double EffectiveStress { + get + { + return wrappedCalculator.EffectiveStress; + } set { wrappedCalculator.EffectiveStress = value; Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -89,6 +89,7 @@ HeaveFactorOfSafety = pipingResult.HeaveFactorOfSafety, SellmeijerZValue = pipingResult.SellmeijerZValue, SellmeijerFactorOfSafety = pipingResult.SellmeijerFactorOfSafety, + UpliftEffectiveStress = pipingResult.UpliftEffectiveStress, HeaveGradient = pipingResult.HeaveGradient, SellmeijerCreepCoefficient = pipingResult.SellmeijerCreepCoefficient, SellmeijerCriticalFall = pipingResult.SellmeijerCriticalFall, @@ -201,11 +202,6 @@ validationResults.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_thickness_aquifer_layer); } - if (double.IsNaN(inputParameters.ThicknessCoverageLayer.Mean)) - { - validationResults.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_thickness_coverage_layer); - } - PipingSoilProfile pipingSoilProfile = inputParameters.StochasticSoilProfile.SoilProfile; double surfaceLevel = inputParameters.SurfaceLine.GetZAtL(inputParameters.ExitPointL); @@ -243,12 +239,8 @@ var validationResult = new List(); bool hasConsecutiveCoverageLayers = pipingSoilProfile.GetConsecutiveCoverageLayersBelowLevel(surfaceLevel).Any(); - if (!hasConsecutiveCoverageLayers) + if (hasConsecutiveCoverageLayers) { - validationResult.Add(Resources.PipingCalculationService_ValidateInput_No_coverage_layer_at_ExitPointL_under_SurfaceLine); - } - else - { RoundedDouble saturatedVolumicWeightOfCoverageLayer = PipingSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters).GetDesignValue(); @@ -276,11 +268,31 @@ warnings.AddRange(GetMultipleAquiferLayersWarning(inputParameters, surfaceLineLevel)); warnings.AddRange(GetMultipleCoverageLayersWarning(inputParameters, surfaceLineLevel)); warnings.AddRange(GetDiameter70Warnings(inputParameters)); + warnings.AddRange(GetThicknessCoverageLayerWarnings(inputParameters)); } return warnings; } + private static IEnumerable GetThicknessCoverageLayerWarnings(PipingInput inputParameters) + { + List warnings = new List(); + + PipingSoilProfile pipingSoilProfile = inputParameters.StochasticSoilProfile.SoilProfile; + double surfaceLevel = inputParameters.SurfaceLine.GetZAtL(inputParameters.ExitPointL); + + bool hasConsecutiveCoverageLayers = pipingSoilProfile.GetConsecutiveCoverageLayersBelowLevel(surfaceLevel).Any(); + if (!hasConsecutiveCoverageLayers) + { + warnings.Add(Resources.PipingCalculationService_ValidateInput_No_coverage_layer_at_ExitPointL_under_SurfaceLine); + } + if (double.IsNaN(inputParameters.ThicknessCoverageLayer.Mean)) + { + warnings.Add(Resources.PipingCalculationService_ValidateInput_Cannot_determine_thickness_coverage_layer); + } + return warnings; + } + private static IEnumerable GetDiameter70Warnings(PipingInput inputParameters) { List warnings = new List(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs =================================================================== diff -u -rd7ac6da9fa00d17a03d6912000c889172bbf12ad -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision d7ac6da9fa00d17a03d6912000c889172bbf12ad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingOutputTest.cs (.../PipingOutputTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -54,6 +54,7 @@ Assert.IsNaN(actual.HeaveFactorOfSafety); Assert.IsNaN(actual.SellmeijerZValue); Assert.IsNaN(actual.SellmeijerFactorOfSafety); + Assert.IsNaN(actual.UpliftEffectiveStress); Assert.IsNaN(actual.HeaveGradient); Assert.IsNaN(actual.SellmeijerCreepCoefficient); Assert.IsNaN(actual.SellmeijerCriticalFall); @@ -70,6 +71,7 @@ var foShValue = random.NextDouble(); var zsValue = random.NextDouble(); var foSsValue = random.NextDouble(); + var upliftEffectiveStress = random.NextDouble(); var heaveGradient = random.NextDouble(); var sellmeijerCreepCoefficient = random.NextDouble(); var sellmeijerCriticalFall = random.NextDouble(); @@ -83,6 +85,7 @@ HeaveFactorOfSafety = foShValue, SellmeijerZValue = zsValue, SellmeijerFactorOfSafety = foSsValue, + UpliftEffectiveStress = upliftEffectiveStress, HeaveGradient = heaveGradient, SellmeijerCreepCoefficient = sellmeijerCreepCoefficient, SellmeijerCriticalFall = sellmeijerCriticalFall, @@ -99,6 +102,8 @@ Assert.AreEqual(zsValue, output.SellmeijerZValue); Assert.AreEqual(foSsValue, output.SellmeijerFactorOfSafety); + Assert.AreEqual(2, output.UpliftEffectiveStress.NumberOfDecimalPlaces); + Assert.AreEqual(upliftEffectiveStress, output.UpliftEffectiveStress, output.UpliftEffectiveStress.GetAccuracy()); Assert.AreEqual(2, output.HeaveGradient.NumberOfDecimalPlaces); Assert.AreEqual(heaveGradient, output.HeaveGradient, output.HeaveGradient.GetAccuracy()); Assert.AreEqual(1, output.SellmeijerCreepCoefficient.NumberOfDecimalPlaces); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs =================================================================== diff -u -rd7ac6da9fa00d17a03d6912000c889172bbf12ad -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs (.../PipingOutputContextPropertiesTest.cs) (revision d7ac6da9fa00d17a03d6912000c889172bbf12ad) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs (.../PipingOutputContextPropertiesTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -65,6 +65,7 @@ double pipingReliability = random.NextDouble(); double pipingFactorOfSafety = random.NextDouble(); + double upliftEffectiveStress = random.NextDouble(); double heaveGradient = random.NextDouble(); double sellmeijerCreepCoefficient = random.NextDouble(); double sellmeijerCriticalFall = random.NextDouble(); @@ -88,6 +89,7 @@ var output = new PipingOutput(new PipingOutput.ConstructionProperties { + UpliftEffectiveStress = upliftEffectiveStress, HeaveGradient = heaveGradient, SellmeijerCreepCoefficient = sellmeijerCreepCoefficient, SellmeijerCriticalFall = sellmeijerCriticalFall, @@ -117,6 +119,7 @@ Assert.AreEqual(pipingReliability, properties.PipingReliability, properties.PipingReliability.GetAccuracy()); Assert.AreEqual(pipingFactorOfSafety, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy()); + Assert.AreEqual(upliftEffectiveStress, properties.UpliftEffectiveStress, properties.UpliftEffectiveStress.GetAccuracy()); Assert.AreEqual(heaveGradient, properties.HeaveGradient, properties.HeaveGradient.GetAccuracy()); Assert.AreEqual(sellmeijerCreepCoefficient, properties.SellmeijerCreepCoefficient, properties.SellmeijerCreepCoefficient.GetAccuracy()); Assert.AreEqual(sellmeijerCriticalFall, properties.SellmeijerCriticalFall, properties.SellmeijerCriticalFall.GetAccuracy()); @@ -223,134 +226,141 @@ { BrowsableAttribute.Yes }); - Assert.AreEqual(18, dynamicProperties.Count); + Assert.AreEqual(19, dynamicProperties.Count); var heaveCategory = "\t\tHeave"; var upliftCategory = "\t\t\tOpbarsten"; var sellmeijerCategory = "\tTerugschrijdende erosie (Sellmeijer)"; var pipingCategory = "Piping"; - PropertyDescriptor upliftFactorOfSafetyProperty = dynamicProperties[0]; + PropertyDescriptor upliftEffectiveStress = dynamicProperties[0]; + Assert.IsNotNull(upliftEffectiveStress); + Assert.IsTrue(upliftEffectiveStress.IsReadOnly); + Assert.AreEqual(upliftCategory, upliftEffectiveStress.Category); + Assert.AreEqual("Gewicht van de deklaag [kN/m²]", upliftEffectiveStress.DisplayName); + Assert.AreEqual("Het effectieve gewicht van de deklaag.", upliftEffectiveStress.Description); + + PropertyDescriptor upliftFactorOfSafetyProperty = dynamicProperties[1]; Assert.IsNotNull(upliftFactorOfSafetyProperty); Assert.IsTrue(upliftFactorOfSafetyProperty.IsReadOnly); Assert.AreEqual(upliftCategory, upliftFactorOfSafetyProperty.Category); Assert.AreEqual("Veiligheidsfactor [-]", upliftFactorOfSafetyProperty.DisplayName); Assert.AreEqual("De veiligheidsfactor voor het submechanisme opbarsten voor deze berekening.", upliftFactorOfSafetyProperty.Description); - PropertyDescriptor upliftReliabilityProperty = dynamicProperties[1]; + PropertyDescriptor upliftReliabilityProperty = dynamicProperties[2]; Assert.IsNotNull(upliftReliabilityProperty); Assert.IsTrue(upliftReliabilityProperty.IsReadOnly); Assert.AreEqual(upliftCategory, upliftReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex [-]", upliftReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex voor het submechanisme opbarsten voor deze berekening.", upliftReliabilityProperty.Description); - PropertyDescriptor upliftProbabilityProperty = dynamicProperties[2]; + PropertyDescriptor upliftProbabilityProperty = dynamicProperties[3]; Assert.IsNotNull(upliftProbabilityProperty); Assert.IsTrue(upliftProbabilityProperty.IsReadOnly); Assert.AreEqual(upliftCategory, upliftProbabilityProperty.Category); Assert.AreEqual("Kans van voorkomen [1/jaar]", upliftProbabilityProperty.DisplayName); Assert.AreEqual("De kans dat het submechanisme opbarsten optreedt voor deze berekening.", upliftProbabilityProperty.Description); - PropertyDescriptor heaveGradientProperty = dynamicProperties[3]; + PropertyDescriptor heaveGradientProperty = dynamicProperties[4]; Assert.IsNotNull(heaveGradientProperty); Assert.IsTrue(heaveGradientProperty.IsReadOnly); Assert.AreEqual(heaveCategory, heaveGradientProperty.Category); Assert.AreEqual("Heave gradiënt [-]", heaveGradientProperty.DisplayName); Assert.AreEqual("De optredende verticale gradiënt in het opbarstkanaal.", heaveGradientProperty.Description); - PropertyDescriptor heaveFactorOfSafetyProperty = dynamicProperties[4]; + PropertyDescriptor heaveFactorOfSafetyProperty = dynamicProperties[5]; Assert.IsNotNull(heaveFactorOfSafetyProperty); Assert.IsTrue(heaveFactorOfSafetyProperty.IsReadOnly); Assert.AreEqual(heaveCategory, heaveFactorOfSafetyProperty.Category); Assert.AreEqual("Veiligheidsfactor [-]", heaveFactorOfSafetyProperty.DisplayName); Assert.AreEqual("De veiligheidsfactor voor het submechanisme heave voor deze berekening.", heaveFactorOfSafetyProperty.Description); - PropertyDescriptor heaveReliabilityProperty = dynamicProperties[5]; + PropertyDescriptor heaveReliabilityProperty = dynamicProperties[6]; Assert.IsNotNull(heaveReliabilityProperty); Assert.IsTrue(heaveReliabilityProperty.IsReadOnly); Assert.AreEqual(heaveCategory, heaveReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex [-]", heaveReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex voor het submechanisme heave voor deze berekening.", heaveReliabilityProperty.Description); - PropertyDescriptor heaveProbabilityProperty = dynamicProperties[6]; + PropertyDescriptor heaveProbabilityProperty = dynamicProperties[7]; Assert.IsNotNull(heaveProbabilityProperty); Assert.IsTrue(heaveProbabilityProperty.IsReadOnly); Assert.AreEqual(heaveCategory, heaveProbabilityProperty.Category); Assert.AreEqual("Kans van voorkomen [1/jaar]", heaveProbabilityProperty.DisplayName); Assert.AreEqual("De kans dat het submechanisme heave optreedt voor deze berekening.", heaveProbabilityProperty.Description); - PropertyDescriptor sellmeijerCreepCoefficientProperty = dynamicProperties[7]; + PropertyDescriptor sellmeijerCreepCoefficientProperty = dynamicProperties[8]; Assert.IsNotNull(sellmeijerCreepCoefficientProperty); Assert.IsTrue(sellmeijerCreepCoefficientProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerCreepCoefficientProperty.Category); Assert.AreEqual("Creep coëfficiënt [-]", sellmeijerCreepCoefficientProperty.DisplayName); Assert.AreEqual("De verhouding tussen de kwelweglengte en het berekende kritieke verval op basis van de regel van Sellmeijer (analoog aan de vuistregel van Bligh).", sellmeijerCreepCoefficientProperty.Description); - PropertyDescriptor sellmeijerCriticalFallProperty = dynamicProperties[8]; + PropertyDescriptor sellmeijerCriticalFallProperty = dynamicProperties[9]; Assert.IsNotNull(sellmeijerCriticalFallProperty); Assert.IsTrue(sellmeijerCriticalFallProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerCriticalFallProperty.Category); Assert.AreEqual("Kritiek verval [m]", sellmeijerCriticalFallProperty.DisplayName); Assert.AreEqual("Het kritieke verval over de waterkering.", sellmeijerCriticalFallProperty.Description); - PropertyDescriptor sellmeijerReducedFallProperty = dynamicProperties[9]; + PropertyDescriptor sellmeijerReducedFallProperty = dynamicProperties[10]; Assert.IsNotNull(sellmeijerReducedFallProperty); Assert.IsTrue(sellmeijerReducedFallProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerReducedFallProperty.Category); Assert.AreEqual("Gereduceerd verval [m]", sellmeijerReducedFallProperty.DisplayName); Assert.AreEqual("Het verschil tussen de buitenwaterstand en de binnenwaterstand, gecorrigeerd voor de drukval in het opbarstkanaal.", sellmeijerReducedFallProperty.Description); - PropertyDescriptor sellmeijerFactorOfSafetyProperty = dynamicProperties[10]; + PropertyDescriptor sellmeijerFactorOfSafetyProperty = dynamicProperties[11]; Assert.IsNotNull(sellmeijerFactorOfSafetyProperty); Assert.IsTrue(sellmeijerFactorOfSafetyProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerFactorOfSafetyProperty.Category); Assert.AreEqual("Veiligheidsfactor [-]", sellmeijerFactorOfSafetyProperty.DisplayName); Assert.AreEqual("De veiligheidsfactor voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening.", sellmeijerFactorOfSafetyProperty.Description); - PropertyDescriptor sellmeijerReliabilityProperty = dynamicProperties[11]; + PropertyDescriptor sellmeijerReliabilityProperty = dynamicProperties[12]; Assert.IsNotNull(sellmeijerReliabilityProperty); Assert.IsTrue(sellmeijerReliabilityProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex [-]", sellmeijerReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex voor het submechanisme terugschrijdende erosie (Sellmeijer) voor deze berekening.", sellmeijerReliabilityProperty.Description); - PropertyDescriptor sellmeijerProbabilityProperty = dynamicProperties[12]; + PropertyDescriptor sellmeijerProbabilityProperty = dynamicProperties[13]; Assert.IsNotNull(sellmeijerProbabilityProperty); Assert.IsTrue(sellmeijerProbabilityProperty.IsReadOnly); Assert.AreEqual(sellmeijerCategory, sellmeijerProbabilityProperty.Category); Assert.AreEqual("Kans van voorkomen [1/jaar]", sellmeijerProbabilityProperty.DisplayName); Assert.AreEqual("De kans dat het submechanisme terugschrijdende erosie (Sellmeijer) optreedt voor deze berekening.", sellmeijerProbabilityProperty.Description); - PropertyDescriptor requiredProbabilityProperty = dynamicProperties[13]; + PropertyDescriptor requiredProbabilityProperty = dynamicProperties[14]; Assert.IsNotNull(requiredProbabilityProperty); Assert.IsTrue(requiredProbabilityProperty.IsReadOnly); Assert.AreEqual(pipingCategory, requiredProbabilityProperty.Category); Assert.AreEqual("Faalkanseis [1/jaar]", requiredProbabilityProperty.DisplayName); Assert.AreEqual("De maximaal toegestane kans dat het toetsspoor piping optreedt.", requiredProbabilityProperty.Description); - PropertyDescriptor requiredReliabilityProperty = dynamicProperties[14]; + PropertyDescriptor requiredReliabilityProperty = dynamicProperties[15]; Assert.IsNotNull(requiredReliabilityProperty); Assert.IsTrue(requiredReliabilityProperty.IsReadOnly); Assert.AreEqual(pipingCategory, requiredReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex faalkanseis [-]", requiredReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.", requiredReliabilityProperty.Description); - PropertyDescriptor pipingProbabilityProperty = dynamicProperties[15]; + PropertyDescriptor pipingProbabilityProperty = dynamicProperties[16]; Assert.IsNotNull(pipingProbabilityProperty); Assert.IsTrue(pipingProbabilityProperty.IsReadOnly); Assert.AreEqual(pipingCategory, pipingProbabilityProperty.Category); Assert.AreEqual("Benaderde faalkans [1/jaar]", pipingProbabilityProperty.DisplayName); Assert.AreEqual("De benaderde kans dat het toetsspoor piping optreedt voor deze berekening.", pipingProbabilityProperty.Description); - PropertyDescriptor pipingReliabilityProperty = dynamicProperties[16]; + PropertyDescriptor pipingReliabilityProperty = dynamicProperties[17]; Assert.IsNotNull(pipingReliabilityProperty); Assert.IsTrue(pipingReliabilityProperty.IsReadOnly); Assert.AreEqual(pipingCategory, pipingReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex faalkans [-]", pipingReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex van de faalkans voor deze berekening.", pipingReliabilityProperty.Description); - PropertyDescriptor pipingFactorOfSafetyProperty = dynamicProperties[17]; + PropertyDescriptor pipingFactorOfSafetyProperty = dynamicProperties[18]; Assert.IsNotNull(pipingFactorOfSafetyProperty); Assert.IsTrue(pipingFactorOfSafetyProperty.IsReadOnly); Assert.AreEqual(pipingCategory, pipingFactorOfSafetyProperty.Category); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorResultTest.cs (.../PipingCalculatorResultTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -51,6 +51,7 @@ Assert.IsNaN(actual.HeaveFactorOfSafety); Assert.IsNaN(actual.SellmeijerZValue); Assert.IsNaN(actual.SellmeijerFactorOfSafety); + Assert.IsNaN(actual.UpliftEffectiveStress); Assert.IsNaN(actual.HeaveGradient); Assert.IsNaN(actual.SellmeijerCreepCoefficient); Assert.IsNaN(actual.SellmeijerCriticalFall); @@ -69,6 +70,7 @@ var zsValue = random.NextDouble(); var foSsValue = random.NextDouble(); var heaveGradient = random.NextDouble(); + var upliftEffectiveStress = random.NextDouble(); var sellmeijerCreepCoefficient = random.NextDouble(); var sellmeijerCriticalFall = random.NextDouble(); var sellmeijerReducedFall = random.NextDouble(); @@ -81,6 +83,7 @@ HeaveFactorOfSafety = foShValue, SellmeijerZValue = zsValue, SellmeijerFactorOfSafety = foSsValue, + UpliftEffectiveStress = upliftEffectiveStress, HeaveGradient = heaveGradient, SellmeijerCreepCoefficient = sellmeijerCreepCoefficient, SellmeijerCriticalFall = sellmeijerCriticalFall, @@ -97,6 +100,7 @@ Assert.AreEqual(foShValue, actual.HeaveFactorOfSafety); Assert.AreEqual(zsValue, actual.SellmeijerZValue); Assert.AreEqual(foSsValue, actual.SellmeijerFactorOfSafety); + Assert.AreEqual(upliftEffectiveStress, actual.UpliftEffectiveStress); Assert.AreEqual(heaveGradient, actual.HeaveGradient); Assert.AreEqual(sellmeijerCreepCoefficient, actual.SellmeijerCreepCoefficient); Assert.AreEqual(sellmeijerCriticalFall, actual.SellmeijerCriticalFall); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -r25695fa024db28f8926ed7e361d19bec16d3c112 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 25695fa024db28f8926ed7e361d19bec16d3c112) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -70,6 +70,7 @@ // Assert Assert.IsNotNull(actual); + Assert.IsFalse(double.IsNaN(actual.UpliftEffectiveStress)); Assert.IsFalse(double.IsNaN(actual.UpliftZValue)); Assert.IsFalse(double.IsNaN(actual.UpliftFactorOfSafety)); Assert.IsFalse(double.IsNaN(actual.HeaveZValue)); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs =================================================================== diff -u -rec79baa6789a55510eea80494f5ff91f293f77b2 -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision ec79baa6789a55510eea80494f5ff91f293f77b2) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -194,7 +194,7 @@ } [Test] - public void GetSaturatedVolumicWeightOfCoverageLayer_PipingInputWithoutCoverLayer_CreateDesignVariableForSaturatedVolumicWeightOfCoverageLayer() + public void GetSaturatedVolumicWeightOfCoverageLayer_PipingInputWithoutCoverLayer_CreateDeterministicDesignVariableForSaturatedVolumicWeightOfCoverageLayer() { // Setup var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -204,10 +204,9 @@ PipingSemiProbabilisticDesignValueFactory.GetSaturatedVolumicWeightOfCoverageLayer(inputParameters); // Assert - DistributionAssert.AreEqual( - inputParameters.SaturatedVolumicWeightOfCoverageLayer, - saturatedVolumicWeightOfCoverageLayer.Distribution); - Assert.AreEqual(RoundedDouble.NaN, saturatedVolumicWeightOfCoverageLayer.GetDesignValue()); + Assert.IsInstanceOf>(saturatedVolumicWeightOfCoverageLayer); + DistributionAssert.AreEqual(inputParameters.SaturatedVolumicWeightOfCoverageLayer, saturatedVolumicWeightOfCoverageLayer.Distribution); + Assert.AreEqual(new RoundedDouble(2), saturatedVolumicWeightOfCoverageLayer.GetDesignValue()); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r5803275ea1237501fd8a9fdd9d1f795d98d0aa4c -ra18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 5803275ea1237501fd8a9fdd9d1f795d98d0aa4c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision a18b7dcb5ed74f0d8ffc9a4d284d98b25816b9b8) @@ -355,22 +355,22 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - Assert.AreEqual("Validatie mislukt: Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.", msgs[1]); - Assert.AreEqual("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); - Assert.AreEqual("Validatie mislukt: Geen watervoerende laag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[3]); - Assert.AreEqual("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[4]); + Assert.AreEqual("Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[1]); + Assert.AreEqual("Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); + Assert.AreEqual("Validatie mislukt: Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.", msgs[3]); + Assert.AreEqual("Validatie mislukt: Geen watervoerende laag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[4]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); Assert.IsFalse(isValid); } [Test] - public void Validate_WithoutAquitardLayer_LogsErrorAndReturnsFalse() + public void Validate_WithoutAquitardLayer_LogsWarningsAndReturnsTrue() { // Setup const string name = ""; - var aquiferLayer = new PipingSoilLayer(2.0) + var aquiferLayer = new PipingSoilLayer(10.56) { IsAquifer = true, DiameterD70Deviation = 0, @@ -384,7 +384,7 @@ aquiferLayer }, SoilProfileType.SoilProfile1D, -1); - + testCalculation.InputParameters.StochasticSoilProfile.SoilProfile = profile; testCalculation.Name = name; @@ -399,15 +399,15 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - Assert.AreEqual("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[1]); - Assert.AreEqual("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[2]); + Assert.AreEqual("Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[1]); + Assert.AreEqual("Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); - Assert.IsFalse(isValid); + Assert.IsTrue(isValid); } [Test] - public void Validate_WithoutCoverageLayer_LogsErrorAndReturnsFalse() + public void Validate_WithoutCoverageLayer_LogsWarningsAndReturnsTrue() { // Setup const string name = ""; @@ -446,11 +446,11 @@ string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", name), msgs.First()); - Assert.AreEqual("Validatie mislukt: Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[1]); - Assert.AreEqual("Validatie mislukt: Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[2]); + Assert.AreEqual("Geen deklaag gevonden voor de ondergrondschematisatie onder de profielschematisatie bij het uittredepunt.", msgs[1]); + Assert.AreEqual("Kan de totale deklaagdikte bij het uittredepunt niet afleiden op basis van de invoer.", msgs[2]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", name), msgs.Last()); }); - Assert.IsFalse(isValid); + Assert.IsTrue(isValid); } [Test] @@ -921,7 +921,15 @@ PipingCalculationService.Calculate(testCalculation); // Assert - Assert.IsNotNull(testCalculation.Output); + var pipingOutput = testCalculation.Output; + Assert.IsNotNull(pipingOutput); + Assert.IsFalse(double.IsNaN(pipingOutput.UpliftEffectiveStress)); + Assert.IsFalse(double.IsNaN(pipingOutput.UpliftZValue)); + Assert.IsFalse(double.IsNaN(pipingOutput.UpliftFactorOfSafety)); + Assert.IsFalse(double.IsNaN(pipingOutput.HeaveZValue)); + Assert.IsFalse(double.IsNaN(pipingOutput.HeaveFactorOfSafety)); + Assert.IsFalse(double.IsNaN(pipingOutput.SellmeijerZValue)); + Assert.IsFalse(double.IsNaN(pipingOutput.SellmeijerFactorOfSafety)); } [Test]