Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Adapt N parameter in stability point structures failure mechanism to be a double on the data model and storage WTI-1531

    • -2
    • +2
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
    • -35
    • +3
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
    • -2
    • +2
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
    • -86
    • +86
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs
    • -1
    • +2
    ./Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs
    • binary
    ./Application.Ringtoets.Storage/Ringtoets.rtd
  1. … 10 more files in changeset.
Added reliability to output of grass cover erosion inwards calculation. WTI-1589

  1. … 10 more files in changeset.
Add N parameter to the grass cover erosion inwards, outwards and height structures failuremechanism database entities WTI-1531

    • -4
    • +4
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
    • -3
    • +35
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs
    • -6
    • +6
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
    • -79
    • +79
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Application.Ringtoets.Storage/Ringtoets.rtd
  1. … 13 more files in changeset.
Regenerated context files related to the Ringtoets project files

WTI-1579

    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs
    • -0
    • +3
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
    • -89
    • +89
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Application.Ringtoets.Storage/Ringtoets.rtd
Resolved by: - temporarily discarding their changes when concerning a binary file - .sql files were merged accordingly

Merge branch 'master' into 1579

# Conflicts:

# Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx

# Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram

# Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd

# build/DatabaseStructure.sql

# design/DatabaseDesign.eap

    • -1
    • +2
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
    • -2
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
  1. … 4 more files in changeset.
Adapt data model to include an N length effect parameter for the grass cover in/outwards, height structures and dune erosion failure mechanisms. WTI-1531

    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
    • -1
    • +3
    ./Application.Ringtoets.Storage/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +3
    ./Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensions.cs
    • -1
    • +2
    ./Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensions.cs
  1. … 31 more files in changeset.
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

    • -9
    • +4
    ./Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
  1. … 1 more file in changeset.
Included the load of HydraulicLocationCalculationEntities to load all necessary tables to generate a RingtoetsProject from a .rtd file

WTI-1579

    • -0
    • +1
    ./Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs
Adapted MacroStabilityInwardsInput (only holds manual assessment level). WTI-1562

    • -12
    • +5
    ./Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
  1. … 1 more file in changeset.
Clean up of source file

WTI-1579

    • -1
    • +1
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
Adjusted the read extensions for the HydraulicBoundaryLocations

WTI-1579

    • -26
    • +31
    ./Application.Ringtoets.Storage/Read/HydraulicLocationEntityReadExtensions.cs
  1. … 1 more file in changeset.
Separated the read extensions for the HydraulicBoundaryLocationOutput into two separate implementations: - Removed obsolete interface => there's no 100% common ground between the entities anymore and thus the extensions should be separated.

WTI-1579

    • -2
    • +0
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs
    • -71
    • +0
    ./Application.Ringtoets.Storage/DbContext/IHydraulicLocationOutputEntity.cs
    • -29
    • +0
    ./Application.Ringtoets.Storage/DbContext/PartialGrassCoverErosionOutwardsHydraulicLocationOutputEntity.cs
  1. … 2 more files in changeset.
Separated the read extensions for the Hydraulic Boundary Location Output into two separate implementations

WTI-1579

    • -0
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -0
    • +52
    ./Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs
    • -3
    • +6
    ./Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs
    • -4
    • +4
    ./Application.Ringtoets.Storage/Read/HydraulicLocationOutputEntityReadExtensions.cs
  1. … 3 more files in changeset.
Add N parameter to the database for the stability stone cover failure mechanism WTI-1531

    • -1
    • +2
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
    • -1
    • +10
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
    • -0
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -1
    • +2
    ./Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs
    • -1
    • +1
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
    • -1
    • +4
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
    • -89
    • +89
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
    • -0
    • +1
    ./Application.Ringtoets.Storage/DbContext/StabilityStoneCoverFailureMechanismMetaEntity.cs
    • -0
    • +11
    ./Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
    • -0
    • +49
    ./Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs
    • binary
    ./Application.Ringtoets.Storage/Ringtoets.rtd
  1. … 11 more files in changeset.
Adjusted CreateExtensions to create HydraulicLocationEntities: - Create the CalculationEntities by using the newly introduced HydraulicBoundaryLocationsCalculationsCreateExtensions - Adjusted tests -> removed obsolete tests asserting the output -- Improved tests for the HydraulicBoundaryLocationsCalculationsCreateExtensions: assert output that does and does not contain GeneralResults (illustrationpoints)

WTI-1579

    • -16
    • +11
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
  1. … 2 more files in changeset.
Introduced create extensions to create Hydraulic Boundary Location calculations

WTI-1579

    • -1
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
  1. … 1 more file in changeset.
Introduced create extensions to create Hydraulic Boundary Location calculations

WTI-1579

    • -0
    • +68
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCalculationCreateExtensions.cs
  1. … 1 more file in changeset.
Removed partial hydraulic location output entity: - Implemented Hydraulic Location output on AssessmentSection as a specific implementatio, adjusted direct tests of this method

WTI-1579

    • -0
    • +36
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
  1. … 1 more file in changeset.
Removed partial hydraulic location output entity: - GrassCoverErosionOutwards implementation and HBL outputs entity implementations differ too much that they do not have common ground anymore - Implemented GrassCoverErosionOutwards as a specific implementation as a first step => removed type parameter from the create extensions, adjusted consumers of this method

WTI-1579

    • -2
    • +2
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
    • -8
    • +13
    ./Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
    • -29
    • +0
    ./Application.Ringtoets.Storage/DbContext/PartialHydraulicLocationOutputEntity.cs
  1. … 1 more file in changeset.
Updated database design: - Added updated .sql database structure scripts to the solution - Generated new context objects

WTI-1579

    • -25
    • +182
    ./Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
    • -0
    • +3
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -0
    • +82
    ./Application.Ringtoets.Storage/DbContext/HydraulicLocationCalculationEntity.cs
    • -5
    • +16
    ./Application.Ringtoets.Storage/DbContext/HydraulicLocationEntity.cs
    • -3
    • +2
    ./Application.Ringtoets.Storage/DbContext/HydraulicLocationOutputEntity.cs
    • -0
    • +1
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Context.cs
    • -29
    • +340
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
    • -91
    • +100
    ./Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
    • binary
    ./Application.Ringtoets.Storage/Ringtoets.rtd
  1. … 2 more files in changeset.
Removed semi probabilistic output for macro stability from storage. WTI-1581

    • -2
    • +0
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -10
    • +0
    ./Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
    • -61
    • +0
    ./Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputCreateExtensions.cs
    • -7
    • +0
    ./Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
    • -57
    • +0
    ./Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensions.cs
  1. … 7 more files in changeset.
Revert "Update Entity Framework to 6.2.0 WTI-1587"

This reverts commit ac0b7dcbe2ab56baafb95f4907e5f5541ac536a3.

    • -7
    • +5
    ./Application.Ringtoets.Storage/App.config
    • -5
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -3
    • +2
    ./Application.Ringtoets.Storage/packages.config
  1. … 6 more files in changeset.
Update Entity Framework to 6.2.0 WTI-1587

    • -5
    • +7
    ./Application.Ringtoets.Storage/App.config
    • -1
    • +5
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -2
    • +3
    ./Application.Ringtoets.Storage/packages.config
  1. … 6 more files in changeset.
Update System.Data.SQLite.* to version 1.0.106.0 WTI-1587

    • -4
    • +4
    ./Application.Ringtoets.Migration.Core/Application.Ringtoets.Migration.Core.csproj
    • -1
    • +1
    ./Application.Ringtoets.Migration.Core/packages.config
    • -6
    • +9
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -2
    • +2
    ./Application.Ringtoets.Storage/packages.config
  1. … 51 more files in changeset.
Implemented review comments WTI-1533 Renamed some typos in filenames Made ProbabilityAssessmentInput an abstract base class Cleanup and improvement of some classes and tests

    • -1
    • +1
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -0
    • +448
    ./Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtensions.cs
    • -448
    • +0
    ./Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs
  1. … 40 more files in changeset.
Pulled changes from master.

    • -9
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
    • -6
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
  1. … 7 more files in changeset.
Adapted PipingInput (only holds manual assessment level). WTI-1562

    • -12
    • +5
    ./Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
    • -9
    • +4
    ./Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
  1. … 2 more files in changeset.
Removed derived piping input from storage. WTI-1581

    • -2
    • +0
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -9
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
    • -70
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs
    • -6
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
    • -56
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs
  1. … 7 more files in changeset.
Removed derived piping input from storage. WTI-1581

    • -2
    • +0
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -9
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
    • -70
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs
    • -6
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
    • -56
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs
  1. … 7 more files in changeset.
Removed derived piping input from storage. WTI-1581

    • -2
    • +0
    ./Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
    • -9
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
    • -70
    • +0
    ./Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs
    • -6
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
    • -56
    • +0
    ./Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs
  1. … 7 more files in changeset.