Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision ad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -87,7 +87,6 @@
{
var metaEntity = new PipingFailureMechanismMetaEntity
{
- A = mechanism.ProbabilityAssessmentInput.A,
WaterVolumetricWeight = mechanism.GeneralInput.WaterVolumetricWeight,
StochasticSoilModelCollectionSourcePath = mechanism.StochasticSoilModels.SourcePath.DeepClone(),
SurfaceLineCollectionSourcePath = mechanism.SurfaceLines.SourcePath.DeepClone(),
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -r30fed475ab02e2b2134425651fd47adf06fc57d9 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 30fed475ab02e2b2134425651fd47adf06fc57d9)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -191,7 +191,6 @@
entity.ReadCommonCalculatableFailureMechanismProperties(failureMechanism, collector);
PipingFailureMechanismMetaEntity metaEntity = entity.PipingFailureMechanismMetaEntities.Single();
- metaEntity.ReadProbabilityAssessmentInput(failureMechanism.ProbabilityAssessmentInput);
metaEntity.ReadGeneralPipingInput(failureMechanism.GeneralInput);
metaEntity.ReadFailureMechanismValues(failureMechanism);
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u -r0fa945d08f557a017ab82b4e033079afbdeae734 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision 0fa945d08f557a017ab82b4e033079afbdeae734)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -36,31 +36,6 @@
{
///
/// Read the and use the information to update the
- /// .
- ///
- /// The to use to update the
- /// .
- /// The to be
- /// updated.
- /// Thrown when any input parameter is null.
- internal static void ReadProbabilityAssessmentInput(this PipingFailureMechanismMetaEntity entity,
- ProbabilityAssessmentInput probabilityAssessmentInput)
- {
- if (entity == null)
- {
- throw new ArgumentNullException(nameof(entity));
- }
-
- if (probabilityAssessmentInput == null)
- {
- throw new ArgumentNullException(nameof(probabilityAssessmentInput));
- }
-
- probabilityAssessmentInput.A = entity.A;
- }
-
- ///
- /// Read the and use the information to update the
/// .
///
/// The to use to update the
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision ad26c9fdcd4d20273a8e4ddf183872da4e1c5bb1)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -80,10 +80,6 @@
{
Body = "Some calculation text"
},
- ProbabilityAssessmentInput =
- {
- A = random.NextDouble()
- },
GeneralInput =
{
WaterVolumetricWeight = random.NextRoundedDouble(0, 20)
@@ -107,7 +103,6 @@
CollectionAssert.IsEmpty(entity.SurfaceLineEntities);
PipingFailureMechanismMetaEntity failureMechanismMetaEntity = entity.PipingFailureMechanismMetaEntities.ToArray()[0];
- Assert.AreEqual(failureMechanism.ProbabilityAssessmentInput.A, failureMechanismMetaEntity.A);
Assert.AreEqual(failureMechanism.GeneralInput.WaterVolumetricWeight.Value, failureMechanismMetaEntity.WaterVolumetricWeight);
Assert.AreEqual(failureMechanism.SurfaceLines.SourcePath, failureMechanismMetaEntity.SurfaceLineCollectionSourcePath);
Assert.AreEqual(failureMechanism.StochasticSoilModels.SourcePath, failureMechanismMetaEntity.StochasticSoilModelCollectionSourcePath);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r30fed475ab02e2b2134425651fd47adf06fc57d9 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 30fed475ab02e2b2134425651fd47adf06fc57d9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -42,7 +42,6 @@
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
using Riskeer.Common.Data.IllustrationPoints;
-using Riskeer.Common.Data.Probability;
using Riskeer.Common.Data.Structures;
using Riskeer.Common.Data.TestUtil;
using Riskeer.DuneErosion.Data;
@@ -579,12 +578,6 @@
Assert.AreEqual(expectedComments.Body, actualComments.Body);
}
- private static void AssertProbabilityAssessmentInput(ProbabilityAssessmentInput expectedModel,
- ProbabilityAssessmentInput actualModel)
- {
- Assert.AreEqual(expectedModel.A, actualModel.A);
- }
-
private static void AssertStructureInputBase(StructuresInputBase expectedInput,
StructuresInputBase actualInput) where T : StructureBase
{
@@ -1059,7 +1052,6 @@
PipingFailureMechanism actualFailureMechanism)
{
Assert.AreEqual(expectedFailureMechanism.ScenarioConfigurationType, actualFailureMechanism.ScenarioConfigurationType);
- AssertProbabilityAssessmentInput(expectedFailureMechanism.ProbabilityAssessmentInput, actualFailureMechanism.ProbabilityAssessmentInput);
AssertPipingStochasticSoilModels(expectedFailureMechanism.StochasticSoilModels, actualFailureMechanism.StochasticSoilModels);
AssertCalculationGroup(expectedFailureMechanism.CalculationsGroup, actualFailureMechanism.CalculationsGroup);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r30fed475ab02e2b2134425651fd47adf06fc57d9 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 30fed475ab02e2b2134425651fd47adf06fc57d9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -389,7 +389,6 @@
AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
var random = new Random(21);
bool inAssembly = random.NextBoolean();
- double parameterA = random.NextDouble() / 10;
const string inAssemblyInputComments = "Some input text";
const string inAssemblyOutputComments = "Some output text";
const string notInAssemblyComments = "Really not in assembly";
@@ -406,10 +405,7 @@
CalculationsInputComments = calculationsInputComments,
PipingFailureMechanismMetaEntities =
{
- new PipingFailureMechanismMetaEntity
- {
- A = parameterA
- }
+ new PipingFailureMechanismMetaEntity()
}
};
entity.FailureMechanismEntities.Add(failureMechanismEntity);
@@ -425,7 +421,6 @@
Assert.AreEqual(inAssemblyInputComments, section.Piping.InAssemblyInputComments.Body);
Assert.AreEqual(inAssemblyOutputComments, section.Piping.InAssemblyOutputComments.Body);
Assert.AreEqual(notInAssemblyComments, section.Piping.NotInAssemblyComments.Body);
- Assert.AreEqual(parameterA, section.Piping.ProbabilityAssessmentInput.A);
Assert.IsNull(section.Piping.FailureMechanismSectionSourcePath);
Assert.IsNull(section.Piping.StochasticSoilModels.SourcePath);
Assert.IsNull(section.Piping.SurfaceLines.SourcePath);
@@ -455,10 +450,7 @@
CalculationsInputComments = calculationsInputComments,
MacroStabilityInwardsFailureMechanismMetaEntities =
{
- new MacroStabilityInwardsFailureMechanismMetaEntity
- {
- A = parameterA
- }
+ new MacroStabilityInwardsFailureMechanismMetaEntity()
}
};
entity.FailureMechanismEntities.Add(failureMechanismEntity);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r30fed475ab02e2b2134425651fd47adf06fc57d9 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 30fed475ab02e2b2134425651fd47adf06fc57d9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -1009,7 +1009,6 @@
{
new PipingFailureMechanismMetaEntity
{
- A = random.NextDouble(),
WaterVolumetricWeight = random.NextDouble(),
PipingScenarioConfigurationType = Convert.ToByte(pipingScenarioConfigurationType)
}
@@ -1033,7 +1032,6 @@
CollectionAssert.IsEmpty(failureMechanism.Sections);
PipingFailureMechanismMetaEntity pipingFailureMechanismMetaEntity = entity.PipingFailureMechanismMetaEntities.Single();
- Assert.AreEqual(pipingFailureMechanismMetaEntity.A, failureMechanism.ProbabilityAssessmentInput.A);
Assert.AreEqual(pipingFailureMechanismMetaEntity.WaterVolumetricWeight, failureMechanism.GeneralInput.WaterVolumetricWeight,
failureMechanism.GeneralInput.WaterVolumetricWeight.GetAccuracy());
Assert.AreEqual(pipingScenarioConfigurationType, failureMechanism.ScenarioConfigurationType);
Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -rc9d53b449a3c61e39d178c1010310e8f98536190 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision c9d53b449a3c61e39d178c1010310e8f98536190)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -22,9 +22,7 @@
using System;
using Core.Common.TestUtil;
using NUnit.Framework;
-using Riskeer.Common.Data.Probability;
using Riskeer.Common.Data.TestUtil;
-using Riskeer.Common.Data.TestUtil.Probability;
using Riskeer.Piping.Data;
using Riskeer.Storage.Core.DbContext;
using Riskeer.Storage.Core.Read.Piping;
@@ -35,52 +33,6 @@
public class PipingFailureMechanismMetaEntityReadExtensionsTest
{
[Test]
- public void ReadProbabilityAssessmentInput_EntityNull_ThrowsArgumentNullException()
- {
- // Setup
- ProbabilityAssessmentInput input = ProbabilityAssessmentInputTestFactory.Create();
-
- // Call
- void Call() => ((PipingFailureMechanismMetaEntity) null).ReadProbabilityAssessmentInput(input);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("entity", exception.ParamName);
- }
-
- [Test]
- public void ReadProbabilityAssessmentInput_ProbabilityAssessmentInputNull_ThrowsArgumentNullException()
- {
- // Setup
- var entity = new PipingFailureMechanismMetaEntity();
-
- // Call
- void Call() => entity.ReadProbabilityAssessmentInput(null);
-
- // Assert
- var exception = Assert.Throws(Call);
- Assert.AreEqual("probabilityAssessmentInput", exception.ParamName);
- }
-
- [Test]
- public void ReadProbabilityAssessmentInput_ValidParameters_SetProbabilityAssessmentInputProperties()
- {
- // Setup
- var random = new Random(31);
- ProbabilityAssessmentInput inputToUpdate = ProbabilityAssessmentInputTestFactory.Create();
- var entity = new PipingFailureMechanismMetaEntity
- {
- A = random.NextDouble()
- };
-
- // Call
- entity.ReadProbabilityAssessmentInput(inputToUpdate);
-
- // Assert
- Assert.AreEqual(entity.A, inputToUpdate.A);
- }
-
- [Test]
public void ReadGeneralPipingInput_EntityNull_ThrowsArgumentNullException()
{
// Setup
Index: Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs
===================================================================
diff -u -r30fed475ab02e2b2134425651fd47adf06fc57d9 -r3648323ae383263a09b8bc642403cf0f2e33c4d7
--- Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 30fed475ab02e2b2134425651fd47adf06fc57d9)
+++ Riskeer/Storage/test/Riskeer.Storage.Core.TestUtil/RiskeerProjectTestHelper.cs (.../RiskeerProjectTestHelper.cs) (revision 3648323ae383263a09b8bc642403cf0f2e33c4d7)
@@ -1357,8 +1357,6 @@
private static void ConfigurePipingFailureMechanism(PipingFailureMechanism pipingFailureMechanism, AssessmentSection assessmentSection)
{
- pipingFailureMechanism.ProbabilityAssessmentInput.A = 0.9;
-
Point2D[] referenceLineGeometryPoints = assessmentSection.ReferenceLine.Points.ToArray();
var pipingSoilProfile = new PipingSoilProfile("SoilProfile1D", 0.0, new[]