Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r3456261423844a9f804b352472ac08feb22485ac -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 3456261423844a9f804b352472ac08feb22485ac)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -94,7 +94,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs
===================================================================
diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision 90deb88f193d2b0eb45c013b1101864c298a18d5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensions.cs (.../GrassCoverErosionInwardsOutputCreateExtensions.cs) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -37,7 +37,8 @@
/// Creates a based on
/// the information of the .
///
- /// The result to create a database entity for.
+ /// The grass cover erosion inwards calculation output to create
+ /// a database entity for.
/// The object keeping track of create operations.
/// A new .
/// Thrown when is null.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -rbc7cd9cbf90d04580e6b3542c56edc590867c43a -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision bc7cd9cbf90d04580e6b3542c56edc590867c43a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -46,47 +46,52 @@
///
internal class PersistenceRegistry
{
- private readonly Dictionary projects = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary assessmentSections = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary failureMechanisms = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary failureMechanismSections = new Dictionary();
- private readonly Dictionary pipingFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary generalGrassCoverErosionInwardsInputs = new Dictionary();
- private readonly Dictionary dikeProfiles = new Dictionary();
- private readonly Dictionary grassCoverErosionInwardsCalculations = new Dictionary();
- private readonly Dictionary grassCoverErosionInwardsOutputs = new Dictionary();
- private readonly Dictionary grassCoverErosionInwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary heightStructuresFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary strengthStabilityLengthwiseConstructionFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary technicalInnovationFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary waterPressureAsphaltCoverFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary closingStructureFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary macrostabilityInwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary macrostabilityOutwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary waveImpactAsphaltCoverFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary grassCoverErosionOutwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary grassCoverSlipOffInwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary grassCoverSlipOffOutwardsFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary microstabilityFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary pipingStructureFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary duneErosionFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary stabilityStoneCoverFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary strengthStabilityPointConstructionFailureMechanismSectionResults = new Dictionary();
- private readonly Dictionary hydraulicLocations = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary calculationGroups = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary pipingCalculations = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary pipingOutputs = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary pipingSemiProbabilisticOutputs = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary stochasticSoilModels = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary stochasticSoilProfiles = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary soilProfiles = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary soilLayers = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary surfaceLines = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary surfaceLinePoints = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary characteristicPoints = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary pipingProbabilityAssessmentInputs = new Dictionary(new ReferenceEqualityComparer());
- private readonly Dictionary probabilisticAssessmentOutputs = new Dictionary(new ReferenceEqualityComparer());
+ private readonly Dictionary projects = CreateDictionary();
+ private readonly Dictionary assessmentSections = CreateDictionary();
+ private readonly Dictionary failureMechanisms = CreateDictionary();
+ private readonly Dictionary failureMechanismSections = CreateDictionary();
+ private readonly Dictionary pipingFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary generalGrassCoverErosionInwardsInputs = CreateDictionary();
+ private readonly Dictionary dikeProfiles = CreateDictionary();
+ private readonly Dictionary grassCoverErosionInwardsCalculations = CreateDictionary();
+ private readonly Dictionary grassCoverErosionInwardsOutputs = CreateDictionary();
+ private readonly Dictionary grassCoverErosionInwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary heightStructuresFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary strengthStabilityLengthwiseConstructionFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary technicalInnovationFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary waterPressureAsphaltCoverFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary closingStructureFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary macrostabilityInwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary macrostabilityOutwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary waveImpactAsphaltCoverFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary grassCoverErosionOutwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary grassCoverSlipOffInwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary grassCoverSlipOffOutwardsFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary microstabilityFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary pipingStructureFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary duneErosionFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary stabilityStoneCoverFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary strengthStabilityPointConstructionFailureMechanismSectionResults = CreateDictionary();
+ private readonly Dictionary hydraulicLocations = CreateDictionary();
+ private readonly Dictionary calculationGroups = CreateDictionary();
+ private readonly Dictionary pipingCalculations = CreateDictionary();
+ private readonly Dictionary pipingOutputs = CreateDictionary();
+ private readonly Dictionary pipingSemiProbabilisticOutputs = CreateDictionary();
+ private readonly Dictionary stochasticSoilModels = CreateDictionary();
+ private readonly Dictionary stochasticSoilProfiles = CreateDictionary();
+ private readonly Dictionary soilProfiles = CreateDictionary();
+ private readonly Dictionary soilLayers = CreateDictionary();
+ private readonly Dictionary surfaceLines = CreateDictionary();
+ private readonly Dictionary surfaceLinePoints = CreateDictionary();
+ private readonly Dictionary characteristicPoints = CreateDictionary();
+ private readonly Dictionary pipingProbabilityAssessmentInputs = CreateDictionary();
+ private readonly Dictionary probabilisticAssessmentOutputs = CreateDictionary();
+ private static Dictionary CreateDictionary()
+ {
+ return new Dictionary(new ReferenceEqualityComparer());
+ }
+
///
/// Registers a create or update operation for and the
/// that was constructed with the information.
Fisheye: Tag a20794746c723f3d02434953861bd3dc57800b73 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilisticAssessmentOutputCreateExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ProbabilityAssessmentOutputCreateExtensions.cs (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -0,0 +1,65 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+
+using Application.Ringtoets.Storage.DbContext;
+
+using Ringtoets.Common.Data.Probability;
+
+namespace Application.Ringtoets.Storage.Create
+{
+ ///
+ /// Extension methods for related to creating a
+ /// .
+ ///
+ internal static class ProbabilityAssessmentOutputCreateExtensions
+ {
+ ///
+ /// Creates a based on the information of
+ /// the .
+ ///
+ /// The result to create a database entity for.
+ /// The object keeping track of create operations.
+ /// A new .
+ /// Thrown when is null.
+ internal static ProbabilisticOutputEntity Create(this ProbabilityAssessmentOutput output, PersistenceRegistry registry)
+ {
+ if (registry == null)
+ {
+ throw new ArgumentNullException("registry");
+ }
+
+ var entity = new ProbabilisticOutputEntity
+ {
+ RequiredProbability = output.RequiredProbability.ToNaNAsNull(),
+ RequiredReliability = output.RequiredReliability.Value.ToNaNAsNull(),
+ Probability = output.Probability.ToNaNAsNull(),
+ Reliability = output.Reliability.Value.ToNaNAsNull(),
+ FactorOfSafety = output.FactorOfSafety.Value.ToNaNAsNull()
+ };
+
+ registry.Register(entity, output);
+
+ return entity;
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs
===================================================================
diff -u -r90deb88f193d2b0eb45c013b1101864c298a18d5 -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 90deb88f193d2b0eb45c013b1101864c298a18d5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -91,7 +91,7 @@
Assert.IsNull(entity.DikeHeight);
Assert.IsNull(entity.WaveHeight);
Assert.AreEqual(Convert.ToByte(output.IsOvertoppingDominant), entity.IsOvertoppingDominant);
-
+ Assert.AreEqual(Convert.ToByte(true), entity.IsDikeHeightCalculated);
Assert.IsNull(entity.ProbabilisticOutputEntity.FactorOfSafety);
Assert.IsNull(entity.ProbabilisticOutputEntity.Probability);
Assert.IsNull(entity.ProbabilisticOutputEntity.Reliability);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProbabilityAssessmentOutputUpdateExtensionsTest.cs
===================================================================
diff -u -r3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6 -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProbabilityAssessmentOutputUpdateExtensionsTest.cs (.../ProbabilityAssessmentOutputUpdateExtensionsTest.cs) (revision 3ddadfbc5e096c8df7d709be0d9a9057cf4b8dd6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProbabilityAssessmentOutputUpdateExtensionsTest.cs (.../ProbabilityAssessmentOutputUpdateExtensionsTest.cs) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -120,7 +120,7 @@
}
[Test]
- public void Update_RingtoetsEntitiesWithMatchingGrassCoverErosionInwardsOutputEntity_RegisterEntity()
+ public void Update_RingtoetsEntitiesWithMatchingProbabilisticOutputEntity_RegisterEntity()
{
// Setup
var mocks = new MockRepository();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs
===================================================================
diff -u -r641deb71d80f4842345b3fce83304a00495010ed -ra20794746c723f3d02434953861bd3dc57800b73
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision 641deb71d80f4842345b3fce83304a00495010ed)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs (.../RingtoetsEntitiesHelper.cs) (revision a20794746c723f3d02434953861bd3dc57800b73)
@@ -42,10 +42,10 @@
DbSet failureMechanismSectionsSet = CreateEmptyTestDbSet();
DbSet failureMechanismSectionPointsSet = CreateEmptyTestDbSet();
DbSet pipingSectionResultsSet = CreateEmptyTestDbSet();
- DbSet dikeProfileEntitiesSet = CreateEmptyTestDbSet();
- DbSet grassCoverErosionInwardsMetaEntitiesSet = CreateEmptyTestDbSet();
- DbSet grassCoverErosionInwardsCalculationEntitiesSet = CreateEmptyTestDbSet();
- DbSet grassCoverErosionInwardsOutputEntitiesSet = CreateEmptyTestDbSet();
+ DbSet dikeProfileSet = CreateEmptyTestDbSet();
+ DbSet grassCoverErosionInwardsMetaSet = CreateEmptyTestDbSet();
+ DbSet grassCoverErosionInwardsCalculationSet = CreateEmptyTestDbSet();
+ DbSet grassCoverErosionInwardsOutputSet = CreateEmptyTestDbSet();
DbSet grassCoverErosionInwardsSectionResultsSet = CreateEmptyTestDbSet();
DbSet heightStructuresSectionResultsSet = CreateEmptyTestDbSet();
DbSet strengthStabilityLengthwiseConstructionSectionResultsSet = CreateEmptyTestDbSet();
@@ -87,10 +87,10 @@
ringtoetsEntities.Stub(r => r.FailureMechanismSectionEntities).Return(failureMechanismSectionsSet);
ringtoetsEntities.Stub(r => r.FailureMechanismSectionPointEntities).Return(failureMechanismSectionPointsSet);
ringtoetsEntities.Stub(r => r.PipingSectionResultEntities).Return(pipingSectionResultsSet);
- ringtoetsEntities.Stub(r => r.DikeProfileEntities).Return(dikeProfileEntitiesSet);
- ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsFailureMechanismMetaEntities).Return(grassCoverErosionInwardsMetaEntitiesSet);
- ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsCalculationEntities).Return(grassCoverErosionInwardsCalculationEntitiesSet);
- ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsOutputEntities).Return(grassCoverErosionInwardsOutputEntitiesSet);
+ ringtoetsEntities.Stub(r => r.DikeProfileEntities).Return(dikeProfileSet);
+ ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsFailureMechanismMetaEntities).Return(grassCoverErosionInwardsMetaSet);
+ ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsCalculationEntities).Return(grassCoverErosionInwardsCalculationSet);
+ ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsOutputEntities).Return(grassCoverErosionInwardsOutputSet);
ringtoetsEntities.Stub(r => r.GrassCoverErosionInwardsSectionResultEntities).Return(grassCoverErosionInwardsSectionResultsSet);
ringtoetsEntities.Stub(r => r.HeightStructuresSectionResultEntities).Return(heightStructuresSectionResultsSet);
ringtoetsEntities.Stub(r => r.StrengthStabilityLengthwiseConstructionSectionResultEntities).Return(strengthStabilityLengthwiseConstructionSectionResultsSet);