Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs (.../PipingSemiProbabilisticOutputCreateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingSemiProbabilisticOutputCreateExtensions.cs (.../PipingSemiProbabilisticOutputCreateExtensions.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -51,7 +51,6 @@ var entity = new PipingSemiProbabilisticOutputEntity { UpliftFactorOfSafety = semiProbabilisticOutput.UpliftFactorOfSafety.Value.ToNaNAsNull(), - UpliftReliability = semiProbabilisticOutput.UpliftReliability.Value.ToNaNAsNull(), UpliftProbability = semiProbabilisticOutput.UpliftProbability.ToNaNAsNull(), HeaveFactorOfSafety = semiProbabilisticOutput.HeaveFactorOfSafety.Value.ToNaNAsNull(), HeaveReliability = semiProbabilisticOutput.HeaveReliability.Value.ToNaNAsNull(), Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r37aadd6a7b1a13ef1c8809b3479df0911c6632bb -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 37aadd6a7b1a13ef1c8809b3479df0911c6632bb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 05-aug-2016 15:32:59 */ +/* Created On : 08-aug-2016 15:10:49 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -388,7 +388,6 @@ ( 'PipingSemiProbabilisticOutputEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'UpliftFactorOfSafety' REAL, - 'UpliftReliability' REAL, 'UpliftProbability' REAL, 'HeaveFactorOfSafety' REAL, 'HeaveReliability' REAL, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingSemiProbabilisticOutputEntity.cs (.../PipingSemiProbabilisticOutputEntity.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -43,7 +43,6 @@ public long PipingSemiProbabilisticOutputEntityId { get; set; } public Nullable UpliftFactorOfSafety { get; set; } - public Nullable UpliftReliability { get; set; } public Nullable UpliftProbability { get; set; } public Nullable HeaveFactorOfSafety { get; set; } public Nullable HeaveReliability { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r37aadd6a7b1a13ef1c8809b3479df0911c6632bb -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 37aadd6a7b1a13ef1c8809b3479df0911c6632bb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Branch_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\repos\WettelijkToetsInstrumentarium\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r37aadd6a7b1a13ef1c8809b3479df0911c6632bb -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 37aadd6a7b1a13ef1c8809b3479df0911c6632bb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -4,7 +4,7 @@ - + @@ -291,7 +291,6 @@ - @@ -1800,7 +1799,6 @@ - @@ -2852,7 +2850,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r37aadd6a7b1a13ef1c8809b3479df0911c6632bb -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 37aadd6a7b1a13ef1c8809b3479df0911c6632bb) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -7,44 +7,44 @@ - - - - + + + + - - + + - - - - - - + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs (.../PipingSemiProbabilisticOutputEntityReadExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensions.cs (.../PipingSemiProbabilisticOutputEntityReadExtensions.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -41,7 +41,7 @@ internal static PipingSemiProbabilisticOutput Read(this PipingSemiProbabilisticOutputEntity entity) { return new PipingSemiProbabilisticOutput( - entity.UpliftFactorOfSafety.ToNullAsNaN(), entity.UpliftReliability.ToNullAsNaN(), entity.UpliftProbability.ToNullAsNaN(), + entity.UpliftFactorOfSafety.ToNullAsNaN(), entity.UpliftProbability.ToNullAsNaN(), entity.HeaveFactorOfSafety.ToNullAsNaN(), entity.HeaveReliability.ToNullAsNaN(), entity.HeaveProbability.ToNullAsNaN(), entity.SellmeijerFactorOfSafety.ToNullAsNaN(), entity.SellmeijerReliability.ToNullAsNaN(), entity.SellmeijerProbability.ToNullAsNaN(), entity.RequiredProbability.ToNullAsNaN(), entity.RequiredReliability.ToNullAsNaN(), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -1895,7 +1895,7 @@ // Setup var registry = new PersistenceRegistry(); - PipingSemiProbabilisticOutput output = new PipingSemiProbabilisticOutput(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); + PipingSemiProbabilisticOutput output = new PipingSemiProbabilisticOutput(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1); // Call TestDelegate test = () => registry.Register(null, output); @@ -2777,7 +2777,7 @@ { PipingSemiProbabilisticOutputEntityId = storageId }; - var model = new PipingSemiProbabilisticOutput(1, 2, 0.3, 4, 5, 0.6, 7, 8, 0.9, 1.0, 11, 0.3, 13, 14); + var model = new PipingSemiProbabilisticOutput(2, 0.3, 4, 5, 0.6, 7, 8, 0.9, 1.0, 11, 0.3, 13, 14); registry.Register(entity, model); // Call @@ -4051,7 +4051,7 @@ dbContext.PipingSemiProbabilisticOutputEntities.Add(orphanedEntity); dbContext.PipingSemiProbabilisticOutputEntities.Add(persistentEntity); - var pipingSemiProbabilisticOutput = new PipingSemiProbabilisticOutput(1, 2, 0.3, 4, 5, 0.6, 7, + var pipingSemiProbabilisticOutput = new PipingSemiProbabilisticOutput(2, 0.3, 4, 5, 0.6, 7, 8, 0.9, 1.0, 11, 0.3, 13, 14) { StorageId = persistentEntity.PipingSemiProbabilisticOutputEntityId Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -rc312034c7478db99d3c2ef96b1c351df806e8d21 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision c312034c7478db99d3c2ef96b1c351df806e8d21) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingCalculationScenarioCreateExtensionsTest.cs (.../PipingCalculationScenarioCreateExtensionsTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -275,7 +275,7 @@ // Setup var registry = new PersistenceRegistry(); - var newOutput = new PipingSemiProbabilisticOutput(1, 2, 0.3, + var newOutput = new PipingSemiProbabilisticOutput(1, 0.3, 4, 5, 0.6, 7, 8, 0.9, 1.0, 11, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSemiProbabilisticOutputCreateExtensionsTest.cs (.../PipingSemiProbabilisticOutputCreateExtensionsTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -41,7 +41,7 @@ public void Create_PersistenceRegistryIsNull_ThrowArgumentNullException() { // Setup - var output = new PipingSemiProbabilisticOutput(1.1, 2.2, 0.3, 4.4, 5.5, 0.6, 7.7, + var output = new PipingSemiProbabilisticOutput(1.1, 0.3, 4.4, 5.5, 0.6, 7.7, 8.8, 0.9, 0.10, 11.11, 0.12, 13.13, 14.14); @@ -57,7 +57,7 @@ public void Create_WithValidValues_ReturnEntity() { // Setup - var output = new PipingSemiProbabilisticOutput(1.1, 2.2, 0.3, 4.4, 5.5, 0.6, 7.7, + var output = new PipingSemiProbabilisticOutput(1.1, 0.3, 4.4, 5.5, 0.6, 7.7, 8.8, 0.9, 0.10, 11.11, 0.12, 13.13, 14.14); var registry = new PersistenceRegistry(); @@ -67,7 +67,6 @@ // Assert AssertAreEqual(output.UpliftFactorOfSafety, entity.UpliftFactorOfSafety); - AssertAreEqual(output.UpliftReliability, entity.UpliftReliability); AssertAreEqual(output.UpliftProbability, entity.UpliftProbability); AssertAreEqual(output.HeaveFactorOfSafety, entity.HeaveFactorOfSafety); AssertAreEqual(output.HeaveReliability, entity.HeaveReliability); @@ -107,7 +106,7 @@ public void Create_WithNaNValues_ReturnEntityWithNullPropertyValues() { // Setup - var output = new PipingSemiProbabilisticOutput(double.NaN, double.NaN, double.NaN, + var output = new PipingSemiProbabilisticOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, @@ -119,7 +118,6 @@ // Assert Assert.IsNull(entity.UpliftFactorOfSafety); - Assert.IsNull(entity.UpliftReliability); Assert.IsNull(entity.UpliftProbability); Assert.IsNull(entity.HeaveFactorOfSafety); Assert.IsNull(entity.HeaveReliability); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs (.../PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs (.../PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -28,7 +28,6 @@ PipingReliability = 6.6, UpliftFactorOfSafety = 7.7, UpliftProbability = 0.8, - UpliftReliability = 9.9, SellmeijerFactorOfSafety = 10.10, SellmeijerProbability = 0.11, SellmeijerReliability = 12.12, @@ -49,7 +48,6 @@ AssertAreEqual(entity.PipingReliability, pipingSemiProbabilisticOutput.PipingReliability); AssertAreEqual(entity.UpliftFactorOfSafety, pipingSemiProbabilisticOutput.UpliftFactorOfSafety); AssertAreEqual(entity.UpliftProbability, pipingSemiProbabilisticOutput.UpliftProbability); - AssertAreEqual(entity.UpliftReliability, pipingSemiProbabilisticOutput.UpliftReliability); AssertAreEqual(entity.SellmeijerFactorOfSafety, pipingSemiProbabilisticOutput.SellmeijerFactorOfSafety); AssertAreEqual(entity.SellmeijerProbability, pipingSemiProbabilisticOutput.SellmeijerProbability); AssertAreEqual(entity.SellmeijerReliability, pipingSemiProbabilisticOutput.SellmeijerReliability); @@ -72,7 +70,6 @@ PipingReliability = null, UpliftFactorOfSafety = null, UpliftProbability = null, - UpliftReliability = null, SellmeijerFactorOfSafety = null, SellmeijerProbability = null, SellmeijerReliability = null, @@ -93,7 +90,6 @@ Assert.IsNaN(pipingSemiProbabilisticOutput.PipingReliability); Assert.IsNaN(pipingSemiProbabilisticOutput.UpliftFactorOfSafety); Assert.IsNaN(pipingSemiProbabilisticOutput.UpliftProbability); - Assert.IsNaN(pipingSemiProbabilisticOutput.UpliftReliability); Assert.IsNaN(pipingSemiProbabilisticOutput.SellmeijerFactorOfSafety); Assert.IsNaN(pipingSemiProbabilisticOutput.SellmeijerProbability); Assert.IsNaN(pipingSemiProbabilisticOutput.SellmeijerReliability); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/Piping/PipingCalculationScenarioUpdateExtensionsTest.cs =================================================================== diff -u -r2363244674e6b7b97bead9a6855806420d368d80 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/Piping/PipingCalculationScenarioUpdateExtensionsTest.cs (.../PipingCalculationScenarioUpdateExtensionsTest.cs) (revision 2363244674e6b7b97bead9a6855806420d368d80) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/Piping/PipingCalculationScenarioUpdateExtensionsTest.cs (.../PipingCalculationScenarioUpdateExtensionsTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -788,7 +788,7 @@ var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { StorageId = entity.PipingCalculationEntityId, - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(1, 1, 1, + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -853,7 +853,7 @@ var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { StorageId = entity.PipingCalculationEntityId, - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(1, 1, 1, + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(1, 1, 1, 1, 1, 1, 1, 1, 1, 1, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r165068d9499f2282a744a79877d0af4461106d9d -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 165068d9499f2282a744a79877d0af4461106d9d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -200,7 +200,7 @@ } }, Output = new PipingOutput(1.1, 2.2, 3.3, 4.4, 5.5, 6.6), - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(7.7, 8.8, 0.9, + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(7.7, 0.9, 10.10, 11.11, 0.12, 13.13, 14.14, 0.15, 0.16, 17.17, Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs =================================================================== diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs (.../PipingSemiProbabilisticOutput.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingSemiProbabilisticOutput.cs (.../PipingSemiProbabilisticOutput.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -23,7 +23,6 @@ /// Creates a new instance of . /// /// The factor of safety for the uplift sub-mechanism. - /// The reliability of uplift the sub-mechanism. /// The probability of failure due to the uplift sub-mechanism. /// The factor of safety for the heave sub-mechanism. /// The reliability of the heave sub-mechanism. @@ -38,14 +37,9 @@ /// The factor of safety for the piping failure mechanism. /// When setting a probability that falls /// outside the [0.0, 1.0] range or isn't . - public PipingSemiProbabilisticOutput(double upliftFactorOfSafety, double upliftReliability, double upliftProbability, - double heaveFactorOfSafety, double heaveReliability, double heaveProbability, - double sellmeijerFactorOfSafety, double sellmeijerReliability, double sellmeijerProbability, - double requiredProbability, double requiredReliability, - double pipingProbability, double pipingReliability, double pipingFactorOfSafety) + public PipingSemiProbabilisticOutput(double upliftFactorOfSafety, double upliftProbability, double heaveFactorOfSafety, double heaveReliability, double heaveProbability, double sellmeijerFactorOfSafety, double sellmeijerReliability, double sellmeijerProbability, double requiredProbability, double requiredReliability, double pipingProbability, double pipingReliability, double pipingFactorOfSafety) { UpliftFactorOfSafety = new RoundedDouble(3, upliftFactorOfSafety); - UpliftReliability = new RoundedDouble(3, upliftReliability); UpliftProbability = upliftProbability; HeaveFactorOfSafety = new RoundedDouble(3, heaveFactorOfSafety); HeaveReliability = new RoundedDouble(3, heaveReliability); Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r2dbf6fcd9ed5be2a6cb8f7ff03ea45d482b3a160 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2dbf6fcd9ed5be2a6cb8f7ff03ea45d482b3a160) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -1355,24 +1355,6 @@ } /// - /// Looks up a localized string similar to De betrouwbaarheidsindex voor het submechanisme Opbarsten voor deze berekening.. - /// - public static string PipingSemiProbabilisticOutput_UpliftReliability_Description { - get { - return ResourceManager.GetString("PipingSemiProbabilisticOutput_UpliftReliability_Description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Betrouwbaarheidsindex [-]. - /// - public static string PipingSemiProbabilisticOutput_UpliftReliability_DisplayName { - get { - return ResourceManager.GetString("PipingSemiProbabilisticOutput_UpliftReliability_DisplayName", resourceCulture); - } - } - - /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap PipingSoilProfileIcon { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r2dbf6fcd9ed5be2a6cb8f7ff03ea45d482b3a160 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2dbf6fcd9ed5be2a6cb8f7ff03ea45d482b3a160) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -556,12 +556,6 @@ Kans van voorkomen [1/jaar] - - De betrouwbaarheidsindex voor het submechanisme Opbarsten voor deze berekening. - - - Betrouwbaarheidsindex [-] - Heave Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs =================================================================== diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs (.../PipingSemiProbabilisticOutputProperties.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSemiProbabilisticOutputProperties.cs (.../PipingSemiProbabilisticOutputProperties.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -25,21 +25,9 @@ } [ResourcesCategory(typeof(Resources), "PipingSemiProbabilisticOutput_Categories_Uplift", 1, 4)] - [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftReliability_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftReliability_Description")] - [PropertyOrder(2)] - public RoundedDouble UpliftReliability - { - get - { - return data.UpliftReliability; - } - } - - [ResourcesCategory(typeof(Resources), "PipingSemiProbabilisticOutput_Categories_Uplift", 1, 4)] [ResourcesDisplayName(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftProbability_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingSemiProbabilisticOutput_UpliftProbability_Description")] - [PropertyOrder(3)] + [PropertyOrder(2)] public string UpliftProbability { get Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -rd71a89b689eceea043d5f7d93ea165fed0442159 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision d71a89b689eceea043d5f7d93ea165fed0442159) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -20,11 +20,12 @@ private readonly double constantB; private readonly double assessmentSectionLength; private readonly double upliftCriticalSafetyFactor; + private readonly double heaveNormDependentFactor; + private readonly double sellmeijerNormDependentFactor; private readonly double contribution; // Intermediate results private double heaveReliability; - private double upliftReliability; private double sellmeijerReliability; private double heaveProbability; @@ -49,8 +50,11 @@ /// The constant a. /// The constant b. /// The length of the assessment section. + /// The critical safety factor which is compared to the safety factor of uplift to determine a probability. + /// The norm dependent factor used in determining the reliability of heave. + /// The norm dependent factor used in determining the reliability of Sellmeijer. /// The contribution of piping to the total failure. - private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety, double sellmeijerFactorOfSafety, int returnPeriod, double constantA, double constantB, double assessmentSectionLength, double upliftCriticalSafetyFactor, double contribution) + private PipingSemiProbabilisticCalculationService(double upliftFactorOfSafety, double heaveFactorOfSafety, double sellmeijerFactorOfSafety, int returnPeriod, double constantA, double constantB, double assessmentSectionLength, double upliftCriticalSafetyFactor, double heaveNormDependentFactor, double sellmeijerNormDependentFactor, double contribution) { this.heaveFactorOfSafety = heaveFactorOfSafety; this.upliftFactorOfSafety = upliftFactorOfSafety; @@ -60,6 +64,8 @@ this.constantB = constantB; this.assessmentSectionLength = assessmentSectionLength; this.upliftCriticalSafetyFactor = upliftCriticalSafetyFactor; + this.heaveNormDependentFactor = heaveNormDependentFactor; + this.sellmeijerNormDependentFactor = sellmeijerNormDependentFactor; this.contribution = contribution; } @@ -89,13 +95,14 @@ pipingProbabilityAssessmentInput.B, pipingProbabilityAssessmentInput.SectionLength, pipingProbabilityAssessmentInput.UpliftCriticalSafetyFactor, + pipingProbabilityAssessmentInput.GetHeaveNormDependentFactor(norm), + pipingProbabilityAssessmentInput.GetSellmeijerNormDependentFactor(norm), contribution/100); calculator.Calculate(); calculation.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput( calculator.upliftFactorOfSafety, - calculator.upliftReliability, calculator.upliftProbability, calculator.heaveFactorOfSafety, calculator.heaveReliability, @@ -137,13 +144,12 @@ /// private void CalculatePipingReliability() { - upliftReliability = SubMechanismReliability(upliftFactorOfSafety, upliftFactors); - upliftProbability = ReliabilityToProbability(upliftReliability); + upliftProbability = UpliftProbability(); - heaveReliability = SubMechanismReliability(heaveFactorOfSafety, heaveFactors); + heaveReliability = HeaveReliability(heaveFactorOfSafety); heaveProbability = ReliabilityToProbability(heaveReliability); - sellmeijerReliability = SubMechanismReliability(sellmeijerFactorOfSafety, sellmeijerFactors); + sellmeijerReliability = SellmeijerReliability(sellmeijerFactorOfSafety); sellmeijerProbability = ReliabilityToProbability(sellmeijerReliability); pipingProbability = PipingProbability(upliftProbability, heaveProbability, sellmeijerProbability); @@ -171,14 +177,21 @@ return (contribution/returnPeriod)/(1 + (constantA*assessmentSectionLength)/constantB); } - private double SubMechanismReliability(double factorOfSafety, SubCalculationFactors factors) + private double UpliftProbability() { - var norm = (1.0/returnPeriod); - var bNorm = ProbabilityToReliability(norm); + return upliftFactorOfSafety <= upliftCriticalSafetyFactor ? 1 : 0; + } - return (1/factors.A)*(Math.Log(factorOfSafety/factors.B) + (factors.C*bNorm)); + private double HeaveReliability(double factorOfSafety) + { + return 2.08*Math.Log(factorOfSafety/heaveNormDependentFactor); } + private double SellmeijerReliability(double factorOfSafety) + { + return 2.7*Math.Log(factorOfSafety/sellmeijerNormDependentFactor); + } + private static void ValidateOutputOnCalculation(PipingCalculation calculation) { if (!calculation.HasOutput) @@ -196,31 +209,5 @@ { return Normal.InvCDF(0, 1, 1 - probability); } - - #region sub-calculation constants - - private struct SubCalculationFactors - { - public double A; - public double B; - public double C; - } - - private readonly SubCalculationFactors upliftFactors = new SubCalculationFactors - { - A = 0.46, B = 0.48, C = 0.27 - }; - - private readonly SubCalculationFactors heaveFactors = new SubCalculationFactors - { - A = 0.48, B = 0.37, C = 0.30 - }; - - private readonly SubCalculationFactors sellmeijerFactors = new SubCalculationFactors - { - A = 0.37, B = 1.04, C = 0.43 - }; - - #endregion } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -90,7 +90,7 @@ var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) }; // Call @@ -134,7 +134,7 @@ var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, double.NaN, 0, 0) + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, double.NaN, 0, 0) }; // Call @@ -153,7 +153,7 @@ var scenario = new PipingCalculationScenario(new GeneralPipingInput()) { Output = new TestPipingOutput(), - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) + SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) }; // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs =================================================================== diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSemiProbabilisticOutputTest.cs (.../PipingSemiProbabilisticOutputTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -55,7 +55,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -116,7 +115,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -162,7 +160,6 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -207,7 +204,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -253,7 +249,6 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -298,7 +293,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -344,7 +338,6 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -389,7 +382,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -435,7 +427,6 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -480,7 +471,6 @@ // Call var output = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -526,7 +516,6 @@ // Call TestDelegate call = () => new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs =================================================================== diff -u -r80c86231452b9beb7e8b8eba3698ceb9c0551de3 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision 80c86231452b9beb7e8b8eba3698ceb9c0551de3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -34,7 +34,6 @@ random.NextDouble(), random.NextDouble(), random.NextDouble(), - random.NextDouble(), (RoundedDouble) probability, random.NextDouble(), random.NextDouble()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs =================================================================== diff -u -re1705d17c577ac884869c00181cac52470cc50f2 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision e1705d17c577ac884869c00181cac52470cc50f2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -44,7 +44,6 @@ // Call var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, @@ -66,7 +65,6 @@ // Call & Assert var probabilityFormat = "1/{0:n0}"; Assert.AreEqual(upliftFactorOfSafety, properties.UpliftFactorOfSafety, properties.UpliftFactorOfSafety.GetAccuracy()); - Assert.AreEqual(upliftReliability, properties.UpliftReliability, properties.UpliftReliability.GetAccuracy()); Assert.AreEqual(string.Format(probabilityFormat, 1.0 / upliftProbability), properties.UpliftProbability); Assert.AreEqual(heaveFactorOfSafety, properties.HeaveFactorOfSafety, properties.HeaveFactorOfSafety.GetAccuracy()); Assert.AreEqual(heaveReliability, properties.HeaveReliability, properties.HeaveReliability.GetAccuracy()); @@ -105,7 +103,6 @@ // Call var semiProbabilisticOutput = new PipingSemiProbabilisticOutput( upliftFactorOfSafety, - upliftReliability, upliftProbability, heaveFactorOfSafety, heaveReliability, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs =================================================================== diff -u -r494d3b3bc20925a8c6b118550837f39ad1f62a1e -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs (.../PipingSemiProbabilisticOutputTreeNodeInfoTest.cs) (revision 494d3b3bc20925a8c6b118550837f39ad1f62a1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSemiProbabilisticOutputTreeNodeInfoTest.cs (.../PipingSemiProbabilisticOutputTreeNodeInfoTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -61,7 +61,7 @@ public void Text_Always_ReturnsTextFromResource() { // Setup - var pipingOutput = mocks.StrictMock(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + var pipingOutput = mocks.StrictMock(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); mocks.ReplayAll(); @@ -76,7 +76,7 @@ public void Image_Always_ReturnsSetImage() { // Setup - var pipingOutput = mocks.StrictMock(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + var pipingOutput = mocks.StrictMock(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); mocks.ReplayAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs =================================================================== diff -u -r687380451d612712c189e04e02da6103c0152d03 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision 687380451d612712c189e04e02da6103c0152d03) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -66,7 +66,6 @@ random.NextDouble(), random.NextDouble(), random.NextDouble(), - random.NextDouble(), random.NextDouble()); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -rb954fb6f2dd56ffb96be7b61ab129f19d879d2ab -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision b954fb6f2dd56ffb96be7b61ab129f19d879d2ab) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -392,7 +392,6 @@ double.NaN, double.NaN, double.NaN, - double.NaN, 0.0005, double.NaN, double.NaN, Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r773a5af872870723a798116250805f47f165d966 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 773a5af872870723a798116250805f47f165d966) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -107,7 +107,7 @@ // Execute the first calculation and ensure the data grid view is updated const double probability = 1.0/31846382.0; pipingCalculation1.Output = new PipingOutput(0, 0, 0, 0, 0, 0); - pipingCalculation1.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, probability, 0, 0); + pipingCalculation1.SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, probability, 0, 0); pipingCalculation1.NotifyObservers(); Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.AreEqual(string.Empty, dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rf109332b5185b4445e2f1b9386dc1fe4063ff20f -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision f109332b5185b4445e2f1b9386dc1fe4063ff20f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -114,7 +114,8 @@ var validPipingCalculation = PipingCalculationFactory.CreateCalculationWithValidInput(); validPipingCalculation.Output = null; - var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); + var norm = new Random(21).Next(100, 300000); + var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); activity.Run(); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -rce94b8228bc7e51779b3754217580f13cb35e475 -rbcd6928813d32119c3b5d8c5c4fa65455e5b4fb8 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision ce94b8228bc7e51779b3754217580f13cb35e475) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision bcd6928813d32119c3b5d8c5c4fa65455e5b4fb8) @@ -32,17 +32,21 @@ public class PipingSemiProbabilisticCalculationServiceTest { [Test] - [TestCase(30000, 1.2, 7.36633055700265E-06)] - [TestCase(30000, 1.0, 4.13743266617776E-05)] - [TestCase(20000, 1.2, 9.53352884976163E-06)] - [TestCase(20000, 1.0, 5.24016937211752E-05)] - public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) + [TestCase(1.24, 1.2, 1.0)] + [TestCase(24.64, 24.63, 0.0)] + [TestCase(24.64, 50.0, 0.0)] + [TestCase(12, 11.94, 1.0)] + public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(double criticalFactorOfSafety, double factorOfSafety, double expectedResult) { // Setup var calculatorResult = new PipingOutput(double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN); var calculation = AsPipingCalculation(calculatorResult); + var norm = new Random(21).Next(100, 300000); - PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); + PipingSemiProbabilisticCalculationService.Calculate(calculation, new PipingProbabilityAssessmentInput + { + UpliftCriticalSafetyFactor = (RoundedDouble) criticalFactorOfSafety + }, norm, double.NaN); // Call double result = calculation.SemiProbabilisticOutput.UpliftProbability; @@ -52,10 +56,10 @@ } [Test] - [TestCase(30000, 0.6, 0.000233010568259)] - [TestCase(30000, 0.4, 0.003967252123066)] - [TestCase(20000, 0.6, 0.000292193848324)] - [TestCase(20000, 0.4, 0.004742775184826)] + [TestCase(30000, 0.6, 9.69402E-05)] + [TestCase(30000, 0.4, 0.001966461)] + [TestCase(1000, 0.6, 0.000733478)] + [TestCase(1000, 0.4, 0.009699472)] public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup @@ -72,10 +76,10 @@ } [Test] - [TestCase(30000, 0.9, 1.0988217217028E-05)] - [TestCase(30000, 0.6, 8.22098269097995E-04)] - [TestCase(20000, 0.9, 1.80799783465546E-05)] - [TestCase(20000, 0.6, 1.20312928722076E-03)] + [TestCase(30000, 0.9, 3.40071E-06)] + [TestCase(30000, 0.6, 0.000330755)] + [TestCase(1000, 0.9, 0.000179351)] + [TestCase(1000, 0.6, 0.006680766)] public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup @@ -92,12 +96,12 @@ } [Test] - [TestCase(30000, 1.2, 0.6, 0.9, 4.332647923)] - [TestCase(30000, 1.2, 1.4, 0.9, 5.264767065)] - [TestCase(30000, 1.2, 0.6, 1.1, 4.786155161)] - [TestCase(20000, 1.2, 0.6, 0.9, 4.275544655)] - [TestCase(20000, 1.2, 1.4, 0.9, 5.203962658)] - [TestCase(20000, 1.2, 0.6, 1.1, 4.673091832)] + [TestCase(30000, 1.2, 0.6, 0.9, 4.499810081)] + [TestCase(30000, 1.2, 1.4, 0.9, 5.489239245)] + [TestCase(30000, 1.2, 0.6, 1.1, 5.041620959)] + [TestCase(1000, 1.2, 0.6, 0.9, 3.568740768)] + [TestCase(1000, 1.2, 1.4, 0.9, 4.943521575)] + [TestCase(1000, 1.2, 0.6, 1.1, 4.110551646)] public void PipingReliability_DifferentInputs_ReturnsExpectedValue(int norm, double fosUplift, double fosHeave, double fosSellmeijer, double expectedResult) { // Setup @@ -146,7 +150,7 @@ double fosUplift = 1.2; double fosHeave = 0.6; double fosSellmeijer = 0.9; - double expectedResult = 0.907; + double expectedResult = 0.941940161; var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput @@ -210,7 +214,7 @@ // Assert RoundedDouble result = pipingCalculation.SemiProbabilisticOutput.PipingFactorOfSafety; - Assert.AreEqual(0.907, result, result.GetAccuracy()); + Assert.AreEqual(0.942, result, result.GetAccuracy()); } [Test]