Index: Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql =================================================================== diff -u -r5d47fec3a77c5b610ecf336545137317c790c6f6 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 5d47fec3a77c5b610ecf336545137317c790c6f6) +++ Application/Ringtoets/src/Application.Ringtoets.Migration/Resources/DatabaseStructure17.1.sql (.../DatabaseStructure17.1.sql) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 14-feb-2017 08:57:56 */ +/* Created On : 15-feb-2017 11:11:55 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -528,7 +528,7 @@ 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SoilProfileEntityId' INTEGER NOT NULL, 'StochasticSoilModelEntityId' INTEGER NOT NULL, - 'Probability' REAL, + 'Probability' REAL NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_StochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade Index: Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs =================================================================== diff -u -r16bd8076863c03907abeee60b16704aba1bdb1a0 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs (.../BackedUpFileWriter.cs) (revision 16bd8076863c03907abeee60b16704aba1bdb1a0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/BackedUpFileWriter.cs (.../BackedUpFileWriter.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -145,7 +145,7 @@ { if (e is ArgumentException || e is IOException || e is NotSupportedException || e is UnauthorizedAccessException) { - var message = string.Format( + string message = string.Format( Resources.SafeOverwriteFileHelper_RemoveAlreadyExistingTemporaryFile_Already_existing_temporary_file_at_FilePath_0_could_not_be_removed, temporaryFilePath); throw new IOException(message, e); @@ -169,7 +169,7 @@ { if (e is ArgumentException || e is IOException || e is UnauthorizedAccessException || e is NotSupportedException) { - var message = string.Format( + string message = string.Format( Resources.SafeOverwriteFileHelper_CreateNewTemporaryFile_Cannot_create_temporary_FilePath_0_Try_change_save_location, targetFilePath); throw new IOException(message, e); @@ -198,7 +198,7 @@ { if (e is ArgumentException || e is IOException || e is NotSupportedException || e is UnauthorizedAccessException) { - var message = string.Format( + string message = string.Format( Resources.SafeOverwriteFileHelper_RestoreOriginalFile_Cannot_revert_to_original_FilePath_0_Try_reverting_manually, targetFilePath); throw new IOException(message, e); @@ -221,7 +221,7 @@ { if (e is ArgumentException || e is IOException || e is NotSupportedException || e is UnauthorizedAccessException) { - var message = string.Format( + string message = string.Format( Resources.SafeOverwriteFileHelper_DeleteTemporaryFile_Cannot_remove_temporary_FilePath_0_Try_removing_manually, temporaryFilePath); throw new CannotDeleteBackupFileException(message, e); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r3014d0ced22c45300938639e7958ea0850485240 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 3014d0ced22c45300938639e7958ea0850485240) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,6 +41,7 @@ using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Serializers; using Core.Common.Utils.Extensions; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Integration.Data; namespace Application.Ringtoets.Storage.Create @@ -124,7 +125,7 @@ for (var i = 0; i < section.HydraulicBoundaryDatabase.Locations.Count; i++) { - var hydraulicBoundaryLocation = section.HydraulicBoundaryDatabase.Locations[i]; + HydraulicBoundaryLocation hydraulicBoundaryLocation = section.HydraulicBoundaryDatabase.Locations[i]; entity.HydraulicLocationEntities.Add(hydraulicBoundaryLocation.Create(registry, i)); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -rd0368f7a05ee1fea5a181022d8619219c4e8c2b2 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision d0368f7a05ee1fea5a181022d8619219c4e8c2b2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -55,7 +55,7 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (ClosingStructuresFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { ClosingStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry); FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); @@ -68,7 +68,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < foreshoreProfiles.Count; i++) + for (var i = 0; i < foreshoreProfiles.Count; i++) { ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); @@ -80,7 +80,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < structures.Count; i++) + for (var i = 0; i < structures.Count; i++) { ClosingStructureEntity structureEntity = structures[i].Create(registry, i); entity.ClosingStructureEntities.Add(structureEntity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs =================================================================== diff -u -rde64f05af3d0b904463f6deaf32234d132668389 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision de64f05af3d0b904463f6deaf32234d132668389) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneErosionFailureMechanismCreateExtensions.cs (.../DuneErosionFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -40,7 +40,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this DuneErosionFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.DuneErosion, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.DuneErosion, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity); AddEntitiesForDuneLocations(mechanism.DuneLocations, entity, registry); @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (DuneErosionFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + DuneErosionSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.DuneErosionSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this GrassCoverErosionInwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.GrassRevetmentTopErosionAndInwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.GrassRevetmentTopErosionAndInwards, registry); AddEntitiesForGeneralInput(mechanism, entity); AddEntitiesForDikeProfiles(mechanism, registry, entity); entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0); @@ -68,10 +68,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (GrassCoverErosionInwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(registry); - var section = registry.Get(failureMechanismSectionResult.Section); + GrassCoverErosionInwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverErosionInwardsSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -43,7 +43,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this GrassCoverErosionOutwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.GrassRevetmentErosionOutwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.GrassRevetmentErosionOutwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); AddEntitiesForFailureMechanismMeta(mechanism.GeneralInput, entity); AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); @@ -55,8 +55,8 @@ private static void AddEntitiesForHydraulicBoundaryLocations(ObservableList hydraulicBoundaryLocations, FailureMechanismEntity entity, PersistenceRegistry registry) { - int i = 0; - foreach (var location in hydraulicBoundaryLocations) + var i = 0; + foreach (HydraulicBoundaryLocation location in hydraulicBoundaryLocations) { entity.GrassCoverErosionOutwardsHydraulicLocationEntities.Add(location.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, i++)); } @@ -71,10 +71,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (GrassCoverErosionOutwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + GrassCoverErosionOutwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverErosionOutwardsSectionResultEntities.Add(sectionResultEntity); } } @@ -84,11 +84,11 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - int i = 0; + var i = 0; - foreach (var foreshoreProfile in foreshoreProfiles) + foreach (ForeshoreProfile foreshoreProfile in foreshoreProfiles) { - var foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffInwards/GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffInwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this GrassCoverSlipOffInwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.GrassRevetmentSlidingInwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.GrassRevetmentSlidingInwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (GrassCoverSlipOffInwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + GrassCoverSlipOffInwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverSlipOffInwardsSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverSlipOffOutwards/GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverSlipOffOutwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this GrassCoverSlipOffOutwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.GrassRevetmentSlidingOutwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.GrassRevetmentSlidingOutwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (GrassCoverSlipOffOutwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + GrassCoverSlipOffOutwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.GrassCoverSlipOffOutwardsSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -r08bb51221d82157423573733a9bf43e0191c9b68 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 08bb51221d82157423573733a9bf43e0191c9b68) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -55,7 +55,7 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (HeightStructuresFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { HeightStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry); FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); @@ -68,7 +68,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < foreshoreProfiles.Count; i++) + for (var i = 0; i < foreshoreProfiles.Count; i++) { ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); @@ -80,7 +80,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < structures.Count; i++) + for (var i = 0; i < structures.Count; i++) { HeightStructureEntity structureEntity = structures[i].Create(registry, i); entity.HeightStructureEntities.Add(structureEntity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IFailureMechanismCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IFailureMechanismCreateExtensions.cs (.../IFailureMechanismCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IFailureMechanismCreateExtensions.cs (.../IFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -46,7 +46,7 @@ throw new ArgumentNullException(nameof(registry)); } - FailureMechanismEntity entity = new FailureMechanismEntity + var entity = new FailureMechanismEntity { FailureMechanismType = (short) type, IsRelevant = Convert.ToByte(mechanism.IsRelevant), @@ -83,7 +83,7 @@ throw new ArgumentNullException(nameof(entity)); } - foreach (var failureMechanismSection in mechanism.Sections) + foreach (FailureMechanismSection failureMechanismSection in mechanism.Sections) { entity.FailureMechanismSectionEntities.Add(failureMechanismSection.Create(registry)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityInwards/MacrostabilityInwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityInwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this MacrostabilityInwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.MacrostabilityInwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.MacrostabilityInwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (MacrostabilityInwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + MacrostabilityInwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.MacrostabilityInwardsSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacrostabilityOutwards/MacrostabilityOutwardsFailureMechanismCreateExtensions.cs (.../MacrostabilityOutwardsFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this MacrostabilityOutwardsFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.MacrostabilityOutwards, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.MacrostabilityOutwards, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (MacrostabilityOutwardsFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + MacrostabilityOutwardsSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.MacrostabilityOutwardsSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs (.../MicrostabilityFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Microstability/MicrostabilityFailureMechanismCreateExtensions.cs (.../MicrostabilityFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this MicrostabilityFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.Microstability, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.Microstability, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (MicrostabilityFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + MicrostabilitySectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.MicrostabilitySectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs =================================================================== diff -u -r946a4e9beadd7a27a313fba0c365be20646abdb7 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this PipingFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.Piping, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.Piping, registry); AddEntitiesForFailureMechanismMeta(mechanism, entity); AddEntitiesForStochasticSoilModels(mechanism, registry, entity); @@ -57,10 +57,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var pipingFailureMechanismSectionResult in sectionResults) + foreach (PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult in sectionResults) { - var pipingSectionResultEntity = pipingFailureMechanismSectionResult.Create(); - var section = registry.Get(pipingFailureMechanismSectionResult.Section); + PipingSectionResultEntity pipingSectionResultEntity = pipingFailureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(pipingFailureMechanismSectionResult.Section); section.PipingSectionResultEntities.Add(pipingSectionResultEntity); } } @@ -80,7 +80,7 @@ private static void AddEntitiesForStochasticSoilModels(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) { - int index = 0; + var index = 0; foreach (StochasticSoilModel stochasticSoilModel in mechanism.StochasticSoilModels) { entity.StochasticSoilModelEntities.Add(stochasticSoilModel.Create(registry, index++)); @@ -89,7 +89,7 @@ private static void AddEntitiesForSurfaceLines(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity) { - int index = 0; + var index = 0; foreach (RingtoetsPipingSurfaceLine surfaceLine in mechanism.SurfaceLines) { entity.SurfaceLineEntities.Add(surfaceLine.Create(registry, index++)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSoilProfileCreateExtensions.cs (.../PipingSoilProfileCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -64,8 +64,8 @@ private static void AddEntitiesForPipingSoilLayers(PipingSoilProfile profile, SoilProfileEntity entity) { - int index = 0; - foreach (var pipingSoilLayer in profile.Layers) + var index = 0; + foreach (PipingSoilLayer pipingSoilLayer in profile.Layers) { entity.SoilLayerEntities.Add(pipingSoilLayer.Create(index++)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/RingtoetsPipingSurfaceLineCreateExtensions.cs (.../RingtoetsPipingSurfaceLineCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -82,8 +82,8 @@ }; foreach (Tuple characteristicPointToSave in characteristicPointAssociations.Where(t => t.Item1 != null)) { - var characteristicPointEntity = CreateCharacteristicPointEntity(characteristicPointToSave.Item1, - characteristicPointToSave.Item2); + CharacteristicPointEntity characteristicPointEntity = CreateCharacteristicPointEntity(characteristicPointToSave.Item1, + characteristicPointToSave.Item2); entity.CharacteristicPointEntities.Add(characteristicPointEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilModelCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilModelCreateExtensions.cs (.../StochasticSoilModelCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilModelCreateExtensions.cs (.../StochasticSoilModelCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -68,9 +68,9 @@ private static void AddEntitiesForStochasticSoilProfiles(StochasticSoilModel model, PersistenceRegistry registry, StochasticSoilModelEntity entity) { - for (int i = 0; i < model.StochasticSoilProfiles.Count; i++) + for (var i = 0; i < model.StochasticSoilProfiles.Count; i++) { - var stochasticSoilProfile = model.StochasticSoilProfiles[i]; + StochasticSoilProfile stochasticSoilProfile = model.StochasticSoilProfiles[i]; entity.StochasticSoilProfileEntities.Add(stochasticSoilProfile.Create(registry, i)); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilProfileCreateExtensions.cs =================================================================== diff -u -rc2bf0666539fa1a781c6d5d633ac292fa4fe2bd4 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilProfileCreateExtensions.cs (.../StochasticSoilProfileCreateExtensions.cs) (revision c2bf0666539fa1a781c6d5d633ac292fa4fe2bd4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/StochasticSoilProfileCreateExtensions.cs (.../StochasticSoilProfileCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -43,7 +43,7 @@ { var entity = new StochasticSoilProfileEntity { - Probability = profile.Probability.ToNaNAsNull(), + Probability = profile.Probability, SoilProfileEntity = profile.SoilProfile.Create(registry), Order = order }; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PipingStructure/PipingStructureFailureMechanismCreateExtensions.cs (.../PipingStructureFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this PipingStructureFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.PipingAtStructure, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.PipingAtStructure, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (PipingStructureFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + PipingStructureSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.PipingStructureSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/RingtoetsProjectCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/RingtoetsProjectCreateExtensions.cs (.../RingtoetsProjectCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/RingtoetsProjectCreateExtensions.cs (.../RingtoetsProjectCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -57,7 +57,7 @@ private static void AddEntitiesForAssessmentSections(RingtoetsProject project, ProjectEntity entity, PersistenceRegistry registry) { - for (int index = 0; index < project.AssessmentSections.Count; index++) + for (var index = 0; index < project.AssessmentSections.Count; index++) { AssessmentSection assessmentSection = project.AssessmentSections[index]; entity.AssessmentSectionEntities.Add(assessmentSection.Create(registry, index)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs =================================================================== diff -u -r3e7db9d95e07d438ec99f8488ec184848655b98c -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs (.../StabilityPointStructuresFailureMechanismCreateExtensions.cs) (revision 3e7db9d95e07d438ec99f8488ec184848655b98c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensions.cs (.../StabilityPointStructuresFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -55,7 +55,7 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (StabilityPointStructuresFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { StabilityPointStructuresSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(registry); FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); @@ -68,7 +68,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < foreshoreProfiles.Count; i++) + for (var i = 0; i < foreshoreProfiles.Count; i++) { ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfiles[i].Create(registry, i); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); @@ -80,7 +80,7 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - for (int i = 0; i < structures.Count; i++) + for (var i = 0; i < structures.Count; i++) { StabilityPointStructureEntity structureEntity = structures[i].Create(registry, i); entity.StabilityPointStructureEntities.Add(structureEntity); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this StabilityStoneCoverFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.StabilityStoneRevetment, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.StabilityStoneRevetment, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); @@ -54,10 +54,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (StabilityStoneCoverFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + StabilityStoneCoverSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.StabilityStoneCoverSectionResultEntities.Add(sectionResultEntity); } } @@ -67,11 +67,11 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - int i = 0; + var i = 0; - foreach (var foreshoreProfile in foreshoreProfiles) + foreach (ForeshoreProfile foreshoreProfile in foreshoreProfiles) { - var foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -22,6 +22,7 @@ using System; using Application.Ringtoets.Storage.DbContext; using Core.Common.Utils.Extensions; +using Ringtoets.Revetment.Data; using Ringtoets.StabilityStoneCover.Data; namespace Application.Ringtoets.Storage.Create.StabilityStoneCover @@ -89,12 +90,12 @@ { if (calculation.HasOutput) { - int i = 0; - foreach (var output in calculation.Output.BlocksOutput) + var i = 0; + foreach (WaveConditionsOutput output in calculation.Output.BlocksOutput) { entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Blocks, i++)); } - foreach (var output in calculation.Output.ColumnsOutput) + foreach (WaveConditionsOutput output in calculation.Output.ColumnsOutput) { entity.StabilityStoneCoverWaveConditionsOutputEntities.Add(output.CreateStabilityStoneCoverWaveConditionsOutputEntity(WaveConditionsOutputType.Columns, i++)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StrengthStabilityLengthwise/StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this StrengthStabilityLengthwiseConstructionFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.StrengthAndStabilityParallelConstruction, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.StrengthAndStabilityParallelConstruction, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + StrengthStabilityLengthwiseConstructionSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.StrengthStabilityLengthwiseConstructionSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/TechnicalInnovation/TechnicalInnovationFailureMechanismCreateExtensions.cs (.../TechnicalInnovationFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this TechnicalInnovationFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.TechnicalInnovations, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.TechnicalInnovations, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (TechnicalInnovationFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + TechnicalInnovationSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.TechnicalInnovationSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaterPressureAsphaltCover/WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaterPressureAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this WaterPressureAsphaltCoverFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.WaterOverpressureAsphaltRevetment, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.WaterOverpressureAsphaltRevetment, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); return entity; @@ -51,10 +51,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (WaterPressureAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + WaterPressureAsphaltCoverSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.WaterPressureAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs =================================================================== diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs (.../WaveImpactAsphaltCoverFailureMechanismCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -41,7 +41,7 @@ /// Thrown when is null. internal static FailureMechanismEntity Create(this WaveImpactAsphaltCoverFailureMechanism mechanism, PersistenceRegistry registry) { - var entity = mechanism.Create(FailureMechanismType.WaveImpactOnAsphaltRevetment, registry); + FailureMechanismEntity entity = mechanism.Create(FailureMechanismType.WaveImpactOnAsphaltRevetment, registry); AddEntitiesForSectionResults(mechanism.SectionResults, registry); AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry); entity.CalculationGroupEntity = mechanism.WaveConditionsCalculationGroup.Create(registry, 0); @@ -53,10 +53,10 @@ IEnumerable sectionResults, PersistenceRegistry registry) { - foreach (var failureMechanismSectionResult in sectionResults) + foreach (WaveImpactAsphaltCoverFailureMechanismSectionResult failureMechanismSectionResult in sectionResults) { - var sectionResultEntity = failureMechanismSectionResult.Create(); - var section = registry.Get(failureMechanismSectionResult.Section); + WaveImpactAsphaltCoverSectionResultEntity sectionResultEntity = failureMechanismSectionResult.Create(); + FailureMechanismSectionEntity section = registry.Get(failureMechanismSectionResult.Section); section.WaveImpactAsphaltCoverSectionResultEntities.Add(sectionResultEntity); } } @@ -66,11 +66,11 @@ FailureMechanismEntity entity, PersistenceRegistry registry) { - int i = 0; + var i = 0; - foreach (var foreshoreProfile in foreshoreProfiles) + foreach (ForeshoreProfile foreshoreProfile in foreshoreProfiles) { - var foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); + ForeshoreProfileEntity foreshoreProfileEntity = foreshoreProfile.Create(registry, i++); entity.ForeshoreProfileEntities.Add(foreshoreProfileEntity); } } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -23,6 +23,7 @@ using Application.Ringtoets.Storage.DbContext; using Core.Common.Utils.Extensions; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Revetment.Data; using Ringtoets.WaveImpactAsphaltCover.Data; namespace Application.Ringtoets.Storage.Create.WaveImpactAsphaltCover @@ -91,8 +92,8 @@ { if (calculation.HasOutput) { - int i = 0; - foreach (var waveConditionsOutput in calculation.Output.Items) + var i = 0; + foreach (WaveConditionsOutput waveConditionsOutput in calculation.Output.Items) { entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Add(waveConditionsOutput.CreateWaveImpactAsphaltCoverWaveConditionsOutputEntity(i++)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -941,7 +941,7 @@ - + @@ -4085,7 +4085,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -6,72 +6,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs =================================================================== diff -u -rec9f45c99b375218d00a89df1ac1e187ebf54070 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision ec9f45c99b375218d00a89df1ac1e187ebf54070) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StochasticSoilProfileEntity.cs (.../StochasticSoilProfileEntity.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -28,7 +28,6 @@ // //------------------------------------------------------------------------------ -using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; @@ -45,7 +44,7 @@ public long StochasticSoilProfileEntityId { get; set; } public long SoilProfileEntityId { get; set; } public long StochasticSoilModelEntityId { get; set; } - public Nullable Probability { get; set; } + public double Probability { get; set; } public int Order { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] Index: Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/FingerprintHelper.cs (.../FingerprintHelper.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -53,7 +53,7 @@ using (HashAlgorithm hashingAlgorithm = MD5.Create()) using (var stream = new MemoryStream()) - using (var writer = XmlDictionaryWriter.CreateBinaryWriter(stream)) + using (XmlDictionaryWriter writer = XmlDictionaryWriter.CreateBinaryWriter(stream)) { var serializer = new DataContractSerializer(entity.GetType(), Enumerable.Empty(), @@ -77,7 +77,7 @@ return false; } // Note: Do not turn this into a linq query, as that is less performance optimal! - for (int i = 0; i < array1.Length; i++) + for (var i = 0; i < array1.Length; i++) { if (!array1[i].Equals(array2[i])) { Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r3014d0ced22c45300938639e7958ea0850485240 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 3014d0ced22c45300938639e7958ea0850485240) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -24,7 +24,6 @@ using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Serializers; using Core.Common.Base.Geometry; -using Core.Components.Gis.Data; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; @@ -140,7 +139,7 @@ Version = entity.HydraulicDatabaseVersion }; - foreach (var hydraulicLocationEntity in entity.HydraulicLocationEntities.OrderBy(hl => hl.Order)) + foreach (HydraulicLocationEntity hydraulicLocationEntity in entity.HydraulicLocationEntities.OrderBy(hl => hl.Order)) { assessmentSection.HydraulicBoundaryDatabase.Locations.Add(hydraulicLocationEntity.Read(collector)); } @@ -149,109 +148,109 @@ private static void ReadPipingFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var pipingFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.Piping); + FailureMechanismEntity pipingFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.Piping); pipingFailureMechanismEntity?.ReadAsPipingFailureMechanism(assessmentSection.PipingFailureMechanism, collector); } private static void ReadGrassCoverErosionInwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var grassCoverErosionInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentTopErosionAndInwards); + FailureMechanismEntity grassCoverErosionInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentTopErosionAndInwards); grassCoverErosionInwardsFailureMechanismEntity?.ReadAsGrassCoverErosionInwardsFailureMechanism(assessmentSection.GrassCoverErosionInwards, collector); } private static void ReadHeightStructuresFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var heightStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StructureHeight); + FailureMechanismEntity heightStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StructureHeight); heightStructuresFailureMechanismEntity?.ReadAsHeightStructuresFailureMechanism(assessmentSection.HeightStructures, collector); } private static void ReadStrengthStabilityLengthwiseConstructionFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var strengthStabilityLengthwiseConstructionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StrengthAndStabilityParallelConstruction); + FailureMechanismEntity strengthStabilityLengthwiseConstructionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StrengthAndStabilityParallelConstruction); strengthStabilityLengthwiseConstructionFailureMechanismEntity?.ReadAsStrengthStabilityLengthwiseConstructionFailureMechanism(assessmentSection.StrengthStabilityLengthwiseConstruction, collector); } private static void ReadTechnicalInnovationFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var technicalInnovationFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.TechnicalInnovations); + FailureMechanismEntity technicalInnovationFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.TechnicalInnovations); technicalInnovationFailureMechanismEntity?.ReadAsTechnicalInnovationFailureMechanism(assessmentSection.TechnicalInnovation, collector); } private static void ReadWaterPressureAsphaltCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var waterPressureAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaterOverpressureAsphaltRevetment); + FailureMechanismEntity waterPressureAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaterOverpressureAsphaltRevetment); waterPressureAsphaltCoverFailureMechanismEntity?.ReadAsWaterPressureAsphaltCoverFailureMechanism(assessmentSection.WaterPressureAsphaltCover, collector); } private static void ReadClosingStructuresFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var closingStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.ReliabilityClosingOfStructure); + FailureMechanismEntity closingStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.ReliabilityClosingOfStructure); closingStructuresFailureMechanismEntity?.ReadAsClosingStructuresFailureMechanism(assessmentSection.ClosingStructures, collector); } private static void ReadMacrostabilityInwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var macrostabilityInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.MacrostabilityInwards); + FailureMechanismEntity macrostabilityInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.MacrostabilityInwards); macrostabilityInwardsFailureMechanismEntity?.ReadAsMacrostabilityInwardsFailureMechanism(assessmentSection.MacrostabilityInwards, collector); } private static void ReadMacrostabilityOutwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var macrostabilityOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.MacrostabilityOutwards); + FailureMechanismEntity macrostabilityOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.MacrostabilityOutwards); macrostabilityOutwardsFailureMechanismEntity?.ReadAsMacrostabilityOutwardsFailureMechanism(assessmentSection.MacrostabilityOutwards, collector); } private static void ReadWaveImpactAsphaltCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var waveImpactAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaveImpactOnAsphaltRevetment); + FailureMechanismEntity waveImpactAsphaltCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.WaveImpactOnAsphaltRevetment); waveImpactAsphaltCoverFailureMechanismEntity?.ReadAsWaveImpactAsphaltCoverFailureMechanism(assessmentSection.WaveImpactAsphaltCover, collector); } private static void ReadGrassCoverErosionOutwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var grassCoverErosionOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentErosionOutwards); + FailureMechanismEntity grassCoverErosionOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentErosionOutwards); grassCoverErosionOutwardsFailureMechanismEntity?.ReadAsGrassCoverErosionOutwardsFailureMechanism(assessmentSection.GrassCoverErosionOutwards, collector); } private static void ReadGrassCoverSlipOffInwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var grassCoverSlipOffInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingInwards); + FailureMechanismEntity grassCoverSlipOffInwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingInwards); grassCoverSlipOffInwardsFailureMechanismEntity?.ReadAsGrassCoverSlipOffInwardsFailureMechanism(assessmentSection.GrassCoverSlipOffInwards, collector); } private static void ReadGrassCoverSlipOffOutwardsFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var grassCoverSlipOffOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingOutwards); + FailureMechanismEntity grassCoverSlipOffOutwardsFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.GrassRevetmentSlidingOutwards); grassCoverSlipOffOutwardsFailureMechanismEntity?.ReadAsGrassCoverSlipOffOutwardsFailureMechanism(assessmentSection.GrassCoverSlipOffOutwards, collector); } private static void ReadMicrostabilityFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var microstabilityFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.Microstability); + FailureMechanismEntity microstabilityFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.Microstability); microstabilityFailureMechanismEntity?.ReadAsMicrostabilityFailureMechanism(assessmentSection.Microstability, collector); } private static void ReadPipingStructureFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var pipingStructureFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.PipingAtStructure); + FailureMechanismEntity pipingStructureFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.PipingAtStructure); pipingStructureFailureMechanismEntity?.ReadAsPipingStructureFailureMechanism(assessmentSection.PipingStructure, collector); } private static void ReadDuneErosionFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var duneErosionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.DuneErosion); + FailureMechanismEntity duneErosionFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.DuneErosion); duneErosionFailureMechanismEntity?.ReadAsDuneErosionFailureMechanism(assessmentSection.DuneErosion, collector); } private static void ReadStabilityStoneCoverFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var stabilityStoneCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StabilityStoneRevetment); + FailureMechanismEntity stabilityStoneCoverFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StabilityStoneRevetment); stabilityStoneCoverFailureMechanismEntity?.ReadAsStabilityStoneCoverFailureMechanism(assessmentSection.StabilityStoneCover, collector); } private static void ReadStabilityPointStructuresFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) { - var stabilityPointStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StabilityPointStructures); + FailureMechanismEntity stabilityPointStructuresFailureMechanismEntity = GetFailureMechanismEntityOfType(entity, FailureMechanismType.StabilityPointStructures); stabilityPointStructuresFailureMechanismEntity?.ReadAsStabilityPointStructuresFailureMechanism(assessmentSection.StabilityPointStructures, collector); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs =================================================================== diff -u -r3014d0ced22c45300938639e7958ea0850485240 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs (.../BackgroundMapDataEntityReadExtensions.cs) (revision 3014d0ced22c45300938639e7958ea0850485240) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/BackgroundMapDataEntityReadExtensions.cs (.../BackgroundMapDataEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -61,7 +61,7 @@ private static WmtsMapData CreateMapData(BackgroundMapDataEntity entity) { - var mapData = WmtsMapData.CreateUnconnectedMapData(); + WmtsMapData mapData = WmtsMapData.CreateUnconnectedMapData(); mapData.Name = entity.Name; if (entity.SourceCapabilitiesUrl != null && entity.SelectedCapabilityName != null && entity.PreferredFormat != null) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs =================================================================== diff -u -r79927347e137e7cf0f0889f8fd2b1a97e3a6f8e3 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision 79927347e137e7cf0f0889f8fd2b1a97e3a6f8e3) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -65,7 +65,7 @@ D50 = entity.D50.ToNullAsNaN() }); - var duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault(); + DuneLocationOutputEntity duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault(); if (duneLocationOutputEntity != null) { duneLocation.Output = duneLocationOutputEntity.Read(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs =================================================================== diff -u -r946a4e9beadd7a27a313fba0c365be20646abdb7 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 946a4e9beadd7a27a313fba0c365be20646abdb7) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -44,6 +44,7 @@ using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.HeightStructures.Data; using Ringtoets.Integration.Data.StandAlone; +using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Piping.Data; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; @@ -79,7 +80,7 @@ IFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var failureMechanismSectionEntity in entity.FailureMechanismSectionEntities) + foreach (FailureMechanismSectionEntity failureMechanismSectionEntity in entity.FailureMechanismSectionEntities) { failureMechanism.AddSection(failureMechanismSectionEntity.Read(collector)); } @@ -143,10 +144,10 @@ PipingFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingSectionResultEntities)) + foreach (PipingSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + PipingFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -203,10 +204,10 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities)) + foreach (GrassCoverErosionInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionInwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + GrassCoverErosionInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result, collector); } @@ -249,10 +250,10 @@ HeightStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities)) + foreach (HeightStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.HeightStructuresSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + HeightStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result, collector); } @@ -302,10 +303,10 @@ StrengthStabilityLengthwiseConstructionFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StrengthStabilityLengthwiseConstructionSectionResultEntities)) + foreach (StrengthStabilityLengthwiseConstructionSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StrengthStabilityLengthwiseConstructionSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -333,10 +334,10 @@ TechnicalInnovationFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.TechnicalInnovationSectionResultEntities)) + foreach (TechnicalInnovationSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.TechnicalInnovationSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + TechnicalInnovationFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -364,10 +365,10 @@ WaterPressureAsphaltCoverFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities)) + foreach (WaterPressureAsphaltCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaterPressureAsphaltCoverSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + WaterPressureAsphaltCoverFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -399,10 +400,10 @@ ClosingStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructuresSectionResultEntities)) + foreach (ClosingStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.ClosingStructuresSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + ClosingStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result, collector); } @@ -453,10 +454,10 @@ MacrostabilityInwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityInwardsSectionResultEntities)) + foreach (MacrostabilityInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityInwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + MacrostabilityInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -484,10 +485,10 @@ MacrostabilityOutwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityOutwardsSectionResultEntities)) + foreach (MacrostabilityOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MacrostabilityOutwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + MacrostabilityOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -518,10 +519,10 @@ WaveImpactAsphaltCoverFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaveImpactAsphaltCoverSectionResultEntities)) + foreach (WaveImpactAsphaltCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.WaveImpactAsphaltCoverSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + WaveImpactAsphaltCoverFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -571,10 +572,10 @@ GrassCoverErosionOutwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionOutwardsSectionResultEntities)) + foreach (GrassCoverErosionOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverErosionOutwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + GrassCoverErosionOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -623,10 +624,10 @@ GrassCoverSlipOffInwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffInwardsSectionResultEntities)) + foreach (GrassCoverSlipOffInwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffInwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + GrassCoverSlipOffInwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -654,10 +655,10 @@ GrassCoverSlipOffOutwardsFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffOutwardsSectionResultEntities)) + foreach (GrassCoverSlipOffOutwardsSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.GrassCoverSlipOffOutwardsSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + GrassCoverSlipOffOutwardsFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -685,10 +686,10 @@ MicrostabilityFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities)) + foreach (MicrostabilitySectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.MicrostabilitySectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + MicrostabilityFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -716,10 +717,10 @@ PipingStructureFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities)) + foreach (PipingStructureSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.PipingStructureSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + PipingStructureFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -754,10 +755,10 @@ DuneErosionFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.DuneErosionSectionResultEntities)) + foreach (DuneErosionSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.DuneErosionSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + DuneErosionFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -804,10 +805,10 @@ StabilityStoneCoverFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityStoneCoverSectionResultEntities)) + foreach (StabilityStoneCoverSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityStoneCoverSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + StabilityStoneCoverFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result); } @@ -850,10 +851,10 @@ StabilityPointStructuresFailureMechanism failureMechanism, ReadConversionCollector collector) { - foreach (var sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities)) + foreach (StabilityPointStructuresSectionResultEntity sectionResultEntity in entity.FailureMechanismSectionEntities.SelectMany(fms => fms.StabilityPointStructuresSectionResultEntities)) { - var failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); - var result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); + FailureMechanismSection failureMechanismSection = collector.Get(sectionResultEntity.FailureMechanismSectionEntity); + StabilityPointStructuresFailureMechanismSectionResult result = failureMechanism.SectionResults.Single(sr => ReferenceEquals(sr.Section, failureMechanismSection)); sectionResultEntity.Read(result, collector); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -55,13 +55,13 @@ entity.LocationX.ToNullAsNaN(), entity.LocationY.ToNullAsNaN()); - var designWaterLevelOutputEntity = GetGrassCoverErosionOutwardsHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.DesignWaterLevel); + IHydraulicLocationOutputEntity designWaterLevelOutputEntity = GetGrassCoverErosionOutwardsHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.DesignWaterLevel); if (designWaterLevelOutputEntity != null) { hydraulicBoundaryLocation.DesignWaterLevelOutput = designWaterLevelOutputEntity.Read(); } - var waveHeightOutputEntity = GetGrassCoverErosionOutwardsHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.WaveHeight); + IHydraulicLocationOutputEntity waveHeightOutputEntity = GetGrassCoverErosionOutwardsHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.WaveHeight); if (waveHeightOutputEntity != null) { hydraulicBoundaryLocation.WaveHeightOutput = waveHeightOutputEntity.Read(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.Linq; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; @@ -89,7 +90,7 @@ return; } - var waveConditionsOutputs = entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.OrderBy(e => e.Order).Select(e => e.Read()).ToList(); + List waveConditionsOutputs = entity.GrassCoverErosionOutwardsWaveConditionsOutputEntities.OrderBy(e => e.Order).Select(e => e.Read()).ToList(); calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(waveConditionsOutputs); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs =================================================================== diff -u -r79927347e137e7cf0f0889f8fd2b1a97e3a6f8e3 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision 79927347e137e7cf0f0889f8fd2b1a97e3a6f8e3) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs (.../HydraulicLocationEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -59,13 +59,13 @@ entity.LocationX.ToNullAsNaN(), entity.LocationY.ToNullAsNaN()); - var designWaterLevelOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.DesignWaterLevel); + IHydraulicLocationOutputEntity designWaterLevelOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.DesignWaterLevel); if (designWaterLevelOutputEntity != null) { hydraulicBoundaryLocation.DesignWaterLevelOutput = designWaterLevelOutputEntity.Read(); } - var waveHeightOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.WaveHeight); + IHydraulicLocationOutputEntity waveHeightOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.WaveHeight); if (waveHeightOutputEntity != null) { hydraulicBoundaryLocation.WaveHeightOutput = waveHeightOutputEntity.Read(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -64,7 +64,7 @@ private static void ReadStochasticSoilProfiles(this StochasticSoilModelEntity entity, StochasticSoilModel model, ReadConversionCollector collector) { - foreach (var stochasticSoilProfileEntity in entity.StochasticSoilProfileEntities.OrderBy(ssp => ssp.Order)) + foreach (StochasticSoilProfileEntity stochasticSoilProfileEntity in entity.StochasticSoilProfileEntities.OrderBy(ssp => ssp.Order)) { model.StochasticSoilProfiles.Add(stochasticSoilProfileEntity.Read(collector)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilProfileEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilProfileEntityReadExtensions.cs (.../StochasticSoilProfileEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/StochasticSoilProfileEntityReadExtensions.cs (.../StochasticSoilProfileEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -50,7 +50,7 @@ return collector.Get(entity); } - var profile = new StochasticSoilProfile(entity.Probability.ToNullAsNaN(), SoilProfileType.SoilProfile1D, -1); + var profile = new StochasticSoilProfile(entity.Probability, SoilProfileType.SoilProfile1D, -1); entity.ReadSoilProfile(profile, collector); collector.Read(entity, profile); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ProjectEntityReadExtensions.cs (.../ProjectEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -50,7 +50,7 @@ Description = entity.Description }; - foreach (var assessmentSectionEntity in entity.AssessmentSectionEntities.OrderBy(ase => ase.Order)) + foreach (AssessmentSectionEntity assessmentSectionEntity in entity.AssessmentSectionEntities.OrderBy(ase => ase.Order)) { project.AssessmentSections.Add(assessmentSectionEntity.Read(collector)); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensions.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -93,9 +93,9 @@ var columnsOutput = new List(); var blocksOutput = new List(); - foreach (var conditionsOutputEntity in entity.StabilityStoneCoverWaveConditionsOutputEntities.OrderBy(oe => oe.Order)) + foreach (StabilityStoneCoverWaveConditionsOutputEntity conditionsOutputEntity in entity.StabilityStoneCoverWaveConditionsOutputEntities.OrderBy(oe => oe.Order)) { - var output = conditionsOutputEntity.Read(); + WaveConditionsOutput output = conditionsOutputEntity.Read(); if (conditionsOutputEntity.OutputType == (byte) WaveConditionsOutputType.Columns) { columnsOutput.Add(output); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs =================================================================== diff -u -r589249bddd12bd66da39205d408ff6e907220116 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision 589249bddd12bd66da39205d408ff6e907220116) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Serializers/DataCollectionSerializer.cs (.../DataCollectionSerializer.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -55,7 +55,7 @@ var memoryStream = new MemoryStream(); - using (var writer = XmlDictionaryWriter.CreateTextWriter(memoryStream, encoding, false)) + using (XmlDictionaryWriter writer = XmlDictionaryWriter.CreateTextWriter(memoryStream, encoding, false)) { var formatter = new DataContractSerializer(serializationRootType); formatter.WriteObject(writer, ToSerializableData(elements)); @@ -90,7 +90,7 @@ streamWriter.Flush(); stream.Seek(0, SeekOrigin.Begin); - using (var reader = XmlDictionaryReader.CreateTextReader(stream, XmlDictionaryReaderQuotas.Max)) + using (XmlDictionaryReader reader = XmlDictionaryReader.CreateTextReader(stream, XmlDictionaryReaderQuotas.Max)) { var serializer = new DataContractSerializer(serializationRootType); return FromSerializableData((TSerializedData[]) serializer.ReadObject(reader)); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs =================================================================== diff -u -rbece78e24185a5156bc10f7ec7875e4510b6934c -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision bece78e24185a5156bc10f7ec7875e4510b6934c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqLite.cs (.../StorageSqLite.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -92,7 +92,7 @@ try { - BackedUpFileWriter writer = new BackedUpFileWriter(databaseFilePath); + var writer = new BackedUpFileWriter(databaseFilePath); writer.Perform(() => { SaveProjectInDatabase(databaseFilePath); }); } catch (IOException e) @@ -111,7 +111,7 @@ public IProject LoadProject(string databaseFilePath) { - var connectionString = GetConnectionToExistingFile(databaseFilePath); + string connectionString = GetConnectionToExistingFile(databaseFilePath); try { RingtoetsProject project; @@ -157,14 +157,12 @@ return true; } - var connectionString = GetConnectionToExistingFile(filePath); + string connectionString = GetConnectionToExistingFile(filePath); try { byte[] originalHash; using (var dbContext = new RingtoetsEntities(connectionString)) - { originalHash = dbContext.VersionEntities.Select(v => v.FingerPrint).First(); - } byte[] hash = FingerprintHelper.Get(stagedProject.Entity); return !FingerprintHelper.AreEqual(originalHash, hash); @@ -177,7 +175,7 @@ private void SaveProjectInDatabase(string databaseFilePath) { - var connectionString = GetConnectionToNewFile(databaseFilePath); + string connectionString = GetConnectionToNewFile(databaseFilePath); using (var dbContext = new RingtoetsEntities(connectionString)) { try @@ -220,21 +218,21 @@ { string m = string.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_is_invalid, databaseVersion); - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m); throw new StorageValidationException(message); } if (RingtoetsVersionHelper.IsNewerThanCurrent(databaseVersion)) { string m = string.Format(Resources.StorageSqLite_ValidateDatabaseVersion_DatabaseVersion_0_higher_then_current_DatabaseVersion_1_, databaseVersion, RingtoetsVersionHelper.GetCurrentDatabaseVersion()); - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(m); throw new StorageValidationException(message); } } catch (InvalidOperationException e) { - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_ValidateDatabaseVersion_Database_must_have_one_VersionEntity_row); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_ValidateDatabaseVersion_Database_must_have_one_VersionEntity_row); throw new StorageValidationException(message, e); } } @@ -284,7 +282,7 @@ { if (!File.Exists(databaseFilePath)) { - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(UtilsResources.Error_File_does_not_exist); throw new CouldNotConnectException(message); } @@ -298,7 +296,7 @@ /// Thrown when the database does not contain the table version. private static string GetConnectionToStorage(string databaseFilePath) { - var connectionString = SqLiteEntityConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath); + string connectionString = SqLiteEntityConnectionStringBuilder.BuildSqLiteEntityConnectionString(databaseFilePath); using (var dbContext = new RingtoetsEntities(connectionString)) { @@ -309,7 +307,7 @@ } catch (Exception exception) { - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_LoadProject_Invalid_Ringtoets_database_file); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(Resources.StorageSqLite_LoadProject_Invalid_Ringtoets_database_file); throw new StorageValidationException(message, exception); } } @@ -325,7 +323,7 @@ /// Returns a new . private static StorageException CreateStorageWriterException(string databaseFilePath, string errorMessage, Exception innerException) { - var message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(errorMessage); + string message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(errorMessage); return new StorageException(message, innerException); } @@ -338,7 +336,7 @@ /// Returns a new . private static StorageException CreateStorageReaderException(string databaseFilePath, string errorMessage, Exception innerException = null) { - var message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(errorMessage); + string message = new FileReaderErrorMessageBuilder(databaseFilePath).Build(errorMessage); return new StorageException(message, innerException); } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs =================================================================== diff -u -rbece78e24185a5156bc10f7ec7875e4510b6934c -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs (.../StorageSqliteCreator.cs) (revision bece78e24185a5156bc10f7ec7875e4510b6934c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/StorageSqliteCreator.cs (.../StorageSqliteCreator.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -52,18 +52,18 @@ if (File.Exists(databaseFilePath)) { - var message = string.Format("File '{0}' already exists.", databaseFilePath); + string message = string.Format("File '{0}' already exists.", databaseFilePath); throw new ArgumentException(message); } SQLiteConnection.CreateFile(databaseFilePath); - var connectionString = SqLiteConnectionStringBuilder.BuildSqLiteConnectionString(databaseFilePath, false); + string connectionString = SqLiteConnectionStringBuilder.BuildSqLiteConnectionString(databaseFilePath, false); try { using (var dbContext = new SQLiteConnection(connectionString, true)) { dbContext.Open(); - using (var command = dbContext.CreateCommand()) + using (SQLiteCommand command = dbContext.CreateCommand()) { command.CommandText = Resources.DatabaseStructure; command.ExecuteNonQuery(); @@ -72,7 +72,7 @@ } catch (SQLiteException exception) { - var message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(Resources.Error_writing_structure_to_database); + string message = new FileWriterErrorMessageBuilder(databaseFilePath).Build(Resources.Error_writing_structure_to_database); throw new StorageException(message, new UpdateStorageException("", exception)); } finally Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r0765637cd19a665cdd0ce28add4fc06499adc6b3 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0765637cd19a665cdd0ce28add4fc06499adc6b3) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -971,14 +971,14 @@ } /// - /// Looks up a localized string similar to BEGIN TRANSACTION; - ///CREATE TABLE "TimeIntegrationSettings" ( - /// "LocationID" INTEGER NOT NULL, - /// "CalculationTypeID" INTEGER NOT NULL, - /// "TimeIntegrationSchemeID" INTEGER NOT NULL, - /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), - /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION - ///); + /// Looks up a localized string similar to BEGIN TRANSACTION; + ///CREATE TABLE "TimeIntegrationSettings" ( + /// "LocationID" INTEGER NOT NULL, + /// "CalculationTypeID" INTEGER NOT NULL, + /// "TimeIntegrationSchemeID" INTEGER NOT NULL, + /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), + /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION + ///); ///CREATE TABLE "Numeri [rest of string was truncated]";. /// public static string settings_schema { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r425a1030cf1f383e0a8f5cbd712c52c5cc2d3369 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 425a1030cf1f383e0a8f5cbd712c52c5cc2d3369) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -200,6 +200,15 @@ } /// + /// Looks up a localized string similar to Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen.. + /// + public static string StochasticSoilProfile_Probability_Should_be_in_range_0_ { + get { + return ResourceManager.GetString("StochasticSoilProfile_Probability_Should_be_in_range_0_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Profielschematisaties moeten een unieke naam hebben. Gevonden dubbele namen: {0}.. /// public static string RingtoetsPipingSurfaceLineCollection_ValidateItems_RingtoetsPipingSurfaceLine_require_unique_names_found_duplicate_items_0_ { Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx =================================================================== diff -u -r425a1030cf1f383e0a8f5cbd712c52c5cc2d3369 -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 425a1030cf1f383e0a8f5cbd712c52c5cc2d3369) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -159,4 +159,7 @@ Profielschematisaties moeten een unieke naam hebben. Gevonden dubbele namen: {0}. + + Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik {0} liggen. + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs =================================================================== diff -u -r24145cb7feea063e2986e8f4b2270bb2a478b3fd -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs (.../StochasticSoilProfile.cs) (revision 24145cb7feea063e2986e8f4b2270bb2a478b3fd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilProfile.cs (.../StochasticSoilProfile.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -20,6 +20,8 @@ // All rights reserved. using System; +using Core.Common.Base.Data; +using Ringtoets.Piping.Data.Properties; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Data @@ -29,6 +31,10 @@ /// public class StochasticSoilProfile { + private double probability; + + private static readonly Range probabilityValidityRange = new Range(0,1); + /// /// Creates a new instance of . /// @@ -60,7 +66,25 @@ /// /// Gets the probability of the stochastic soil profile. /// - public double Probability { get; private set; } + /// Thrown when the is outside the range + /// [0, 1]. + public double Probability + { + get + { + return probability; + } + private set + { + if (!probabilityValidityRange.InRange(value)) + { + throw new ArgumentOutOfRangeException(nameof(value), string.Format( + Resources.StochasticSoilProfile_Probability_Should_be_in_range_0_, + probabilityValidityRange)); + } + probability = value; + } + } /// /// Updates the probability of the Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -re1a8e98d60853beefbdb8c84e70f14165680ad7b -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision e1a8e98d60853beefbdb8c84e70f14165680ad7b) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Ringtoets.Piping.IO.SoilProfile; using Ringtoets.Piping.IO.SoilProfile.Schema; namespace Ringtoets.Piping.IO.Builders @@ -175,5 +174,16 @@ StochasticSoilModelTableColumns.StochasticSoilModelName, StochasticSoilModelTableColumns.TableName); } + + public static string GetStochasticSoilProfileProbabilitiesValidQuery() + { + return string.Format( + "SELECT COUNT({1}) == 0 as {0} " + + "FROM {2} " + + "WHERE {1} NOT BETWEEN 0 AND 1 OR {1} ISNULL;", + StochasticSoilProfileTableColumns.HasNoInvalidProbabilities, + StochasticSoilProfileTableColumns.Probability, + StochasticSoilProfileTableColumns.TableName); + } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/Schema/StochasticSoilProfileTableColumns.cs =================================================================== diff -u -re1a8e98d60853beefbdb8c84e70f14165680ad7b -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/Schema/StochasticSoilProfileTableColumns.cs (.../StochasticSoilProfileTableColumns.cs) (revision e1a8e98d60853beefbdb8c84e70f14165680ad7b) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/Schema/StochasticSoilProfileTableColumns.cs (.../StochasticSoilProfileTableColumns.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -32,5 +32,6 @@ internal const string SoilProfile1DId = "SP1D_ID"; internal const string SoilProfile2DId = "SP2D_ID"; internal const string Probability = "Probability"; + internal const string HasNoInvalidProbabilities = "HasNoInvalidProbabilities"; } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs =================================================================== diff -u -re1a8e98d60853beefbdb8c84e70f14165680ad7b -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs (.../SoilDatabaseConstraintsReader.cs) (revision e1a8e98d60853beefbdb8c84e70f14165680ad7b) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs (.../SoilDatabaseConstraintsReader.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -63,9 +63,21 @@ } catch (SQLiteException exception) { + string innerMessage = $"Kan geen ondergrondmodellen lezen. Mogelijk bestaat de '{StochasticSoilModelTableColumns.TableName}' tabel niet."; throw new CriticalFileReadException( - BuildMessageWithPath("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'Segment' tabel niet."), exception); + BuildMessageWithPath(innerMessage), exception); } + + try + { + ReadNoEmptyProbabilityValues(); + } + catch (SQLiteException exception) + { + string innerMessage = $"Kan geen ondergrondschematisaties lezen. Mogelijk bestaat de '{StochasticSoilProfileTableColumns.TableName}' tabel niet."; + throw new CriticalFileReadException( + BuildMessageWithPath(innerMessage), exception); + } } private void ReadUniqueSegements() @@ -86,6 +98,24 @@ } } + private void ReadNoEmptyProbabilityValues() + { + string checkSegmentNameUniqueness = SoilDatabaseQueryBuilder.GetStochasticSoilProfileProbabilitiesValidQuery(); + using (IDataReader dataReader = CreateDataReader(checkSegmentNameUniqueness)) + { + if (!dataReader.Read()) + { + throw new CriticalFileReadException( + BuildMessageWithPath("Onverwachte fout tijdens het verifiëren van kansen van voorkomen voor profielen.")); + } + if (!Convert.ToBoolean(dataReader[StochasticSoilProfileTableColumns.HasNoInvalidProbabilities])) + { + throw new CriticalFileReadException( + BuildMessageWithPath("Er zijn stochastische ondergrondschematisaties zonder geldige kans van voorkomen.")); + } + } + } + private string BuildMessageWithPath(string innerMessage) { string message = new FileReaderErrorMessageBuilder(Path) Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilProfileTest.cs =================================================================== diff -u -r76a7de2e77e45645d0e7e485e03333baf9cc3b0d -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilProfileTest.cs (.../StochasticSoilProfileTest.cs) (revision 76a7de2e77e45645d0e7e485e03333baf9cc3b0d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/StochasticSoilProfileTest.cs (.../StochasticSoilProfileTest.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -35,7 +35,7 @@ [Test] [TestCase(0.1, SoilProfileType.SoilProfile1D, 123L)] [TestCase(0.26, SoilProfileType.SoilProfile2D, 123L)] - public void Constructor_Always_ExpectedValues(double probability, SoilProfileType soilProfileType, long soilProfileId) + public void Constructor_WithValidProbabilities_ExpectedValues(double probability, SoilProfileType soilProfileType, long soilProfileId) { // Call var stochasticSoilProfileProbability = new StochasticSoilProfile(probability, soilProfileType, soilProfileId); @@ -48,12 +48,25 @@ } [Test] + [TestCase(12.5)] + [TestCase(1 + 1e-6)] + [TestCase(0 - 1e-6)] + [TestCase(-66.3)] + [TestCase(double.NaN)] + public void Constructor_WithInvalidProbabilities_ThrowsArgumentOutOfRangeException(double probability) + { + // Call + TestDelegate test = () => new StochasticSoilProfile(probability, SoilProfileType.SoilProfile1D, -1); + + // Assert + var expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0, 1] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + } + + [Test] [TestCase(0)] [TestCase(0.23)] [TestCase(0.41)] - [TestCase(double.NaN)] - [TestCase(double.MaxValue)] - [TestCase(double.MinValue)] public void AddProbability_DifferentValues_ProbabilityIncreasedAsExpected(double probabilityToAdd) { // Setup @@ -68,6 +81,28 @@ } [Test] + [TestCase(double.MaxValue)] + [TestCase(double.MinValue)] + [TestCase(1.0)] + [TestCase(-1.0)] + [TestCase(double.NaN)] + + public void AddProbability_DifferentValuesMakingProbabilityInvalid_ThrowsArgumentOutOfRangeException(double probabilityToAdd) + { + // Setup + var startProbability = new Random(21).NextDouble() * 0.5; + var profile = new StochasticSoilProfile(startProbability, SoilProfileType.SoilProfile1D, -1); + + // Call + TestDelegate test = () => profile.AddProbability(probabilityToAdd); + + // Assert + var expectedMessage = "Het aandeel van de ondergrondschematisatie in het stochastische ondergrondmodel moet in het bereik [0, 1] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, expectedMessage); + Assert.AreEqual(startProbability, profile.Probability); + } + + [Test] public void Update_WithNullProfile_ThrowsArgumentNullException() { // Setup Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -re1a8e98d60853beefbdb8c84e70f14165680ad7b -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision e1a8e98d60853beefbdb8c84e70f14165680ad7b) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -107,9 +107,24 @@ } [Test] - public void GetSegmentNamesUniqueQuery_Always_ReturnsExpectedValues() + public void GetCheckVersionQuery_Always_ReturnsExpectedValues() { // Setup + const string expectedQuery = "SELECT Value " + + "FROM _MetaData " + + "WHERE Key = 'VERSION' AND Value = @Value;"; + + // Call + string query = SoilDatabaseQueryBuilder.GetCheckVersionQuery(); + + // Assert + Assert.AreEqual(expectedQuery, query); + } + + [Test] + public void GetSoilModelNamesUniqueQuery_Always_ReturnsExpectedValues() + { + // Setup const string expectedQuery = "SELECT [All].nameCount == [Distinct].nameCount as AreSegmentsUnique " + "FROM(SELECT COUNT(SSM_Name) nameCount FROM StochasticSoilModel) AS [All] " + @@ -123,15 +138,15 @@ } [Test] - public void GetCheckVersionQuery_Always_ReturnsExpectedValues() + public void GetStochasticSoilProfileProbabilitiesDefinedQuery_Always_ReturnsExpectedValues() { // Setup - const string expectedQuery = "SELECT Value " + - "FROM _MetaData " + - "WHERE Key = 'VERSION' AND Value = @Value;"; + const string expectedQuery = "SELECT COUNT(Probability) == 0 as HasNoInvalidProbabilities " + + "FROM StochasticSoilProfile " + + "WHERE Probability NOT BETWEEN 0 AND 1 OR Probability ISNULL;"; // Call - string query = SoilDatabaseQueryBuilder.GetCheckVersionQuery(); + string query = SoilDatabaseQueryBuilder.GetStochasticSoilProfileProbabilitiesValidQuery(); // Assert Assert.AreEqual(expectedQuery, query); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseConstraintsReaderTest.cs =================================================================== diff -u -r9a9a99ad27ee6fdcd22f0df408b868816502647e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseConstraintsReaderTest.cs (.../SoilDatabaseConstraintsReaderTest.cs) (revision 9a9a99ad27ee6fdcd22f0df408b868816502647e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseConstraintsReaderTest.cs (.../SoilDatabaseConstraintsReaderTest.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -65,11 +65,10 @@ } [Test] - [TestCase("nonUniqueSoilModelNames.soil")] - public void Constructor_NonUniqueSoilModelNames_ThrowsCriticalFileReadException(string dbName) + public void VerifyConstraints_NonUniqueSoilModelNames_ThrowsCriticalFileReadException() { // Setup - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "nonUniqueSoilModelNames.soil"); string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). Build("Namen van ondergrondmodellen zijn niet uniek."); @@ -88,5 +87,77 @@ } Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } + + [Test] + public void VerifyConstraints_MissingStochasticSoilModelTable_ThrowsCriticalFileReadException() + { + // Setup + string dbFile = Path.Combine(testDataPath, "missingStochasticSoilModelTable.soil"); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). + Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); + + // Precondition + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); + + // Call + using (var versionReader = new SoilDatabaseConstraintsReader(dbFile)) + { + // Call + TestDelegate test = () => versionReader.VerifyConstraints(); + + // Assert + CriticalFileReadException exception = Assert.Throws(test); + Assert.AreEqual(expectedMessage, exception.Message); + } + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); + } + + [Test] + public void VerifyConstraints_MissingStochasticSoilProfileTable_ThrowsCriticalFileReadException() + { + // Setup + string dbFile = Path.Combine(testDataPath, "missingStochasticSoilProfileTable.soil"); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). + Build("Kan geen ondergrondschematisaties lezen. Mogelijk bestaat de 'StochasticSoilProfile' tabel niet."); + + // Precondition + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); + + // Call + using (var versionReader = new SoilDatabaseConstraintsReader(dbFile)) + { + // Call + TestDelegate test = () => versionReader.VerifyConstraints(); + + // Assert + CriticalFileReadException exception = Assert.Throws(test); + Assert.AreEqual(expectedMessage, exception.Message); + } + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); + } + + [Test] + public void VerifyConstraints_MissingStochasticSoilProfileProbability_ThrowsCriticalFileReadException() + { + // Setup + string dbFile = Path.Combine(testDataPath, "missingStochasticSoilProfileProbability.soil"); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). + Build("Er zijn stochastische ondergrondschematisaties zonder geldige kans van voorkomen."); + + // Precondition + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); + + // Call + using (var versionReader = new SoilDatabaseConstraintsReader(dbFile)) + { + // Call + TestDelegate test = () => versionReader.VerifyConstraints(); + + // Assert + CriticalFileReadException exception = Assert.Throws(test); + Assert.AreEqual(expectedMessage, exception.Message); + } + Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r9a9a99ad27ee6fdcd22f0df408b868816502647e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 9a9a99ad27ee6fdcd22f0df408b868816502647e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -60,8 +60,7 @@ public void Constructor_FileNullOrEmpty_ThrowsCriticalFileReadException(string fileName) { // Setup - var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': {1}", - fileName, "bestandspad mag niet leeg of ongedefinieerd zijn."); + var expectedMessage = $"Fout bij het lezen van bestand '{fileName}': bestandspad mag niet leeg of ongedefinieerd zijn."; // Call TestDelegate test = () => { using (new StochasticSoilModelReader(fileName)) {} }; @@ -93,12 +92,12 @@ } [Test] - public void Constructor_InvalidSchemaThatPassesValidation_ThrowsCriticalFileReadException() + public void Constructor_InvalidSchemaThatPassesVersionValidation_ThrowsCriticalFileReadException() { // Setup string dbFile = Path.Combine(testDataPath, "withoutSoilModelTables.soil"); string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'Segment' tabel niet."); + Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilModelTable.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileProbability.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileTable.soil =================================================================== diff -u Binary files differ Index: build/DatabaseStructure.sql =================================================================== diff -u -r019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 0fbb881c5c82f540f01772234b3c1faadfab07f9) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 14-feb-2017 08:57:56 */ +/* Created On : 15-feb-2017 11:11:55 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -528,7 +528,7 @@ 'StochasticSoilProfileEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'SoilProfileEntityId' INTEGER NOT NULL, 'StochasticSoilModelEntityId' INTEGER NOT NULL, - 'Probability' REAL, + 'Probability' REAL NOT NULL, 'Order' INT (4) NOT NULL, CONSTRAINT 'FK_StochasticSoilProfileEntity_SoilProfileEntity' FOREIGN KEY ('SoilProfileEntityId') REFERENCES 'SoilProfileEntity' ('SoilProfileEntityId') ON DELETE Cascade ON UPDATE Cascade, CONSTRAINT 'FK_StochasticSoilProfileEntity_StochasticSoilModelEntity' FOREIGN KEY ('StochasticSoilModelEntityId') REFERENCES 'StochasticSoilModelEntity' ('StochasticSoilModelEntityId') ON DELETE Cascade ON UPDATE Cascade Index: design/DatabaseDesign.eap =================================================================== diff -u -r019b64a79b9ed7626f1f3c4e8b9f93b85fbbb38e -r0fbb881c5c82f540f01772234b3c1faadfab07f9 Binary files differ