Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rfcad48d7beb394e1ac15cfe4289a7381e05aa883 -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision fcad48d7beb394e1ac15cfe4289a7381e05aa883)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -452,7 +452,6 @@
-
@@ -490,7 +489,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -57,7 +57,6 @@
};
SetInputParametersToEntity(entity, calculation.InputParameters, registry);
AddEntityForPipingOutput(entity, calculation.Output);
- AddEntityForPipingSemiProbabilisticOutput(entity, calculation.SemiProbabilisticOutput);
return entity;
}
@@ -111,13 +110,5 @@
entity.PipingCalculationOutputEntities.Add(output.Create());
}
}
-
- private static void AddEntityForPipingSemiProbabilisticOutput(PipingCalculationEntity entity, PipingSemiProbabilisticOutput output)
- {
- if (output != null)
- {
- entity.PipingSemiProbabilisticOutputEntities.Add(output.Create());
- }
- }
}
}
\ No newline at end of file
Fisheye: Tag cc98f3bc7734296dd2d3bd2ed62b5be531948e0f refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs
===================================================================
diff -u -ra096ab65b419231f9d0a2a3d771464efa2a65e8f -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision a096ab65b419231f9d0a2a3d771464efa2a65e8f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -75,12 +75,6 @@
{
calculation.Output = calculationOutputEntity.Read();
}
-
- PipingSemiProbabilisticOutputEntity semiProbabilisticOutputEntity = entity.PipingSemiProbabilisticOutputEntities.FirstOrDefault();
- if (semiProbabilisticOutputEntity != null)
- {
- calculation.SemiProbabilisticOutput = semiProbabilisticOutputEntity.Read();
- }
}
private static void ReadInputParameters(PipingInput inputParameters, PipingCalculationEntity entity, ReadConversionCollector collector)
Fisheye: Tag cc98f3bc7734296dd2d3bd2ed62b5be531948e0f refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r1c167e8adf4521008ed654b807a875df32e96244 -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 1c167e8adf4521008ed654b807a875df32e96244)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -173,7 +173,6 @@
-
@@ -215,7 +214,6 @@
-
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r0ff5e3f64a1425c8ffb73da83e1438f157fd1e6f -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision 0ff5e3f64a1425c8ffb73da83e1438f157fd1e6f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -306,44 +306,5 @@
Assert.AreEqual(newOutput.SellmeijerCriticalFall, outputEntity.SellmeijerCriticalFall, newOutput.SellmeijerCriticalFall.GetAccuracy());
Assert.AreEqual(newOutput.SellmeijerReducedFall, outputEntity.SellmeijerReducedFall, newOutput.SellmeijerReducedFall.GetAccuracy());
}
-
- [Test]
- public void Create_HasPipingSemiProbabilisticOutput_EntityHasPipingSemiProbabilisticOutputEntity()
- {
- // Setup
- var registry = new PersistenceRegistry();
-
- var newOutput = new PipingSemiProbabilisticOutput(1, 2, 0.3,
- 4, 5, 0.6,
- 7, 8, 0.9,
- 1.0, 11,
- 0.2, 13, 14);
- var calculation = new PipingCalculationScenario(new GeneralPipingInput())
- {
- SemiProbabilisticOutput = newOutput
- };
-
- // Call
- PipingCalculationEntity entity = calculation.Create(registry, 0);
-
- // Assert
- PipingSemiProbabilisticOutputEntity outputEntity = entity.PipingSemiProbabilisticOutputEntities.FirstOrDefault();
-
- Assert.IsNotNull(outputEntity);
- Assert.AreEqual(newOutput.UpliftFactorOfSafety, outputEntity.UpliftFactorOfSafety, newOutput.UpliftFactorOfSafety.GetAccuracy());
- Assert.AreEqual(newOutput.UpliftReliability, outputEntity.UpliftReliability, newOutput.UpliftReliability.GetAccuracy());
- Assert.AreEqual(newOutput.UpliftProbability, outputEntity.UpliftProbability);
- Assert.AreEqual(newOutput.HeaveFactorOfSafety, outputEntity.HeaveFactorOfSafety, newOutput.HeaveFactorOfSafety.GetAccuracy());
- Assert.AreEqual(newOutput.HeaveReliability, outputEntity.HeaveReliability, newOutput.HeaveReliability.GetAccuracy());
- Assert.AreEqual(newOutput.HeaveProbability, outputEntity.HeaveProbability);
- Assert.AreEqual(newOutput.SellmeijerFactorOfSafety, outputEntity.SellmeijerFactorOfSafety, newOutput.SellmeijerFactorOfSafety.GetAccuracy());
- Assert.AreEqual(newOutput.SellmeijerReliability, outputEntity.SellmeijerReliability, newOutput.SellmeijerReliability.GetAccuracy());
- Assert.AreEqual(newOutput.SellmeijerProbability, outputEntity.SellmeijerProbability);
- Assert.AreEqual(newOutput.RequiredProbability, outputEntity.RequiredProbability);
- Assert.AreEqual(newOutput.RequiredReliability, outputEntity.RequiredReliability, newOutput.RequiredReliability.GetAccuracy());
- Assert.AreEqual(newOutput.PipingProbability, outputEntity.PipingProbability);
- Assert.AreEqual(newOutput.PipingReliability, outputEntity.PipingReliability, newOutput.PipingReliability.GetAccuracy());
- Assert.AreEqual(newOutput.PipingFactorOfSafety, outputEntity.PipingFactorOfSafety, newOutput.PipingFactorOfSafety.GetAccuracy());
- }
}
}
\ No newline at end of file
Fisheye: Tag cc98f3bc7734296dd2d3bd2ed62b5be531948e0f refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -r0ff5e3f64a1425c8ffb73da83e1438f157fd1e6f -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 0ff5e3f64a1425c8ffb73da83e1438f157fd1e6f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -1256,7 +1256,6 @@
AssertPipingInput(expectedPipingCalculation.InputParameters, actualPipingCalculation.InputParameters);
AssertPipingOutput(expectedPipingCalculation.Output, actualPipingCalculation.Output);
- AssertPipingSemiProbabilisticOutput(expectedPipingCalculation.SemiProbabilisticOutput, actualPipingCalculation.SemiProbabilisticOutput);
}
private static void AssertPipingInput(PipingInput expectedPipingInput, PipingInput actualPipingInput)
@@ -1307,36 +1306,6 @@
}
}
- private static void AssertPipingSemiProbabilisticOutput(PipingSemiProbabilisticOutput expectedOutput,
- PipingSemiProbabilisticOutput actualOutput)
- {
- if (expectedOutput == null)
- {
- Assert.IsNull(actualOutput);
- }
- else
- {
- Assert.AreEqual(expectedOutput.HeaveFactorOfSafety, actualOutput.HeaveFactorOfSafety);
- Assert.AreEqual(expectedOutput.HeaveProbability, actualOutput.HeaveProbability);
- Assert.AreEqual(expectedOutput.HeaveReliability, actualOutput.HeaveReliability);
-
- Assert.AreEqual(expectedOutput.SellmeijerFactorOfSafety, actualOutput.SellmeijerFactorOfSafety);
- Assert.AreEqual(expectedOutput.SellmeijerProbability, actualOutput.SellmeijerProbability);
- Assert.AreEqual(expectedOutput.SellmeijerReliability, actualOutput.SellmeijerReliability);
-
- Assert.AreEqual(expectedOutput.UpliftFactorOfSafety, actualOutput.UpliftFactorOfSafety);
- Assert.AreEqual(expectedOutput.UpliftProbability, actualOutput.UpliftProbability);
- Assert.AreEqual(expectedOutput.UpliftReliability, actualOutput.UpliftReliability);
-
- Assert.AreEqual(expectedOutput.RequiredReliability, actualOutput.RequiredReliability);
- Assert.AreEqual(expectedOutput.RequiredProbability, actualOutput.RequiredProbability);
-
- Assert.AreEqual(expectedOutput.PipingFactorOfSafety, actualOutput.PipingFactorOfSafety);
- Assert.AreEqual(expectedOutput.PipingReliability, actualOutput.PipingReliability);
- Assert.AreEqual(expectedOutput.PipingProbability, actualOutput.PipingProbability);
- }
- }
-
private static void AssertPipingStochasticSoilModels(PipingStochasticSoilModelCollection expectedModels,
PipingStochasticSoilModelCollection actualModels)
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -re7b185318230da4ee757edd438ed065559597135 -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision e7b185318230da4ee757edd438ed065559597135)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -122,7 +122,6 @@
Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
Assert.IsNull(calculation.InputParameters.StochasticSoilProfile);
Assert.IsNull(calculation.Output);
- Assert.IsNull(calculation.SemiProbabilisticOutput);
}
[Test]
@@ -364,46 +363,6 @@
Assert.IsNaN(output.SellmeijerReducedFall);
}
- [Test]
- public void Read_EntityWithPipingSemiProbabilisticOutputEntity_CalculationWithPipingSemiProbabilisticOutput()
- {
- // Setup
- var entity = new PipingCalculationEntity
- {
- EntryPointL = 1,
- ExitPointL = 2,
- DampingFactorExitMean = 1,
- PipingSemiProbabilisticOutputEntities =
- {
- new PipingSemiProbabilisticOutputEntity()
- }
- };
-
- var collector = new ReadConversionCollector();
-
- // Call
- PipingCalculationScenario calculation = entity.Read(collector, new GeneralPipingInput());
-
- // Assert
- PipingSemiProbabilisticOutput output = calculation.SemiProbabilisticOutput;
- Assert.IsNotNull(output);
-
- Assert.IsNaN(output.HeaveFactorOfSafety);
- Assert.IsNaN(output.HeaveProbability);
- Assert.IsNaN(output.HeaveReliability);
- Assert.IsNaN(output.PipingFactorOfSafety);
- Assert.IsNaN(output.PipingProbability);
- Assert.IsNaN(output.PipingReliability);
- Assert.IsNaN(output.UpliftFactorOfSafety);
- Assert.IsNaN(output.UpliftProbability);
- Assert.IsNaN(output.UpliftReliability);
- Assert.IsNaN(output.SellmeijerFactorOfSafety);
- Assert.IsNaN(output.SellmeijerProbability);
- Assert.IsNaN(output.SellmeijerReliability);
- Assert.IsNaN(output.RequiredProbability);
- Assert.IsNaN(output.RequiredReliability);
- }
-
private static void AssertRoundedDouble(double? expectedValue, RoundedDouble actualValue)
{
Assert.IsTrue(expectedValue.HasValue);
Fisheye: Tag cc98f3bc7734296dd2d3bd2ed62b5be531948e0f refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r2749bf520104b5f610fbfe06299b32d3cb5cd86b -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 2749bf520104b5f610fbfe06299b32d3cb5cd86b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
@@ -959,12 +959,7 @@
StandardDeviation = (RoundedDouble) 4.4
}
},
- Output = new TestPipingOutput(),
- SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(7.7, 8.8, 0.9,
- 10.10, 11.11, 0.12,
- 13.13, 14.14, 0.15,
- 0.16, 17.17,
- 0.18, 19.19, 20.20)
+ Output = new TestPipingOutput()
},
new PipingCalculationScenario(pipingFailureMechanism.GeneralInput)
{
@@ -996,8 +991,7 @@
UseAssessmentLevelManualInput = true,
AssessmentLevel = (RoundedDouble) 6.0
},
- Output = new TestPipingOutput(),
- SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput()
+ Output = new TestPipingOutput()
}
}
});