Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r3e9547a3e5375a431aaf4ad4192e9c087e0a6a75 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 3e9547a3e5375a431aaf4ad4192e9c087e0a6a75)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -55,7 +55,6 @@
-
@@ -399,7 +398,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensions.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensions.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -60,7 +60,6 @@
};
SetInputParametersToEntity(entity, calculation.InputParameters, registry);
AddEntityForMacroStabilityInwardsOutput(entity, calculation.Output);
- AddEntityForMacroStabilityInwardsSemiProbabiliticOutput(entity, calculation.SemiProbabilisticOutput);
return entity;
}
@@ -195,14 +194,5 @@
entity.MacroStabilityInwardsCalculationOutputEntities.Add(output.Create());
}
}
-
- private static void AddEntityForMacroStabilityInwardsSemiProbabiliticOutput(MacroStabilityInwardsCalculationEntity entity,
- MacroStabilityInwardsSemiProbabilisticOutput output)
- {
- if (output != null)
- {
- entity.MacroStabilityInwardsSemiProbabilisticOutputEntities.Add(output.Create());
- }
- }
}
}
\ No newline at end of file
Fisheye: Tag d1519950f365a9a8d3f4f75186f73e98a6ac6b51 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputCreateExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs (.../MacroStabilityInwardsCalculationEntityReadExtensions.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -70,13 +70,6 @@
private static void SetCalculationOutputsToScenario(MacroStabilityInwardsCalculationScenario calculationScenario,
MacroStabilityInwardsCalculationEntity entity)
{
- MacroStabilityInwardsSemiProbabilisticOutputEntity semiProbabilisticOutputEntity =
- entity.MacroStabilityInwardsSemiProbabilisticOutputEntities.FirstOrDefault();
- if (semiProbabilisticOutputEntity != null)
- {
- calculationScenario.SemiProbabilisticOutput = semiProbabilisticOutputEntity.Read();
- }
-
MacroStabilityInwardsCalculationOutputEntity outputEntity = entity.MacroStabilityInwardsCalculationOutputEntities.FirstOrDefault();
if (outputEntity != null)
{
Fisheye: Tag d1519950f365a9a8d3f4f75186f73e98a6ac6b51 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r3e9547a3e5375a431aaf4ad4192e9c087e0a6a75 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 3e9547a3e5375a431aaf4ad4192e9c087e0a6a75)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -67,7 +67,6 @@
-
@@ -120,7 +119,6 @@
-
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -416,33 +416,5 @@
Assert.IsNotNull(outputEntity);
MacroStabilityInwardsCalculationOutputEntityTestHelper.AssertOutputPropertyValues(scenario.Output, outputEntity);
}
-
- [Test]
- public void Create_HasMacroStabilityInwardsSemiProbabilisticOutput_ReturnsEntityWithSemiProbabilisticOutputEntity()
- {
- // Setup
- var scenario = new MacroStabilityInwardsCalculationScenario
- {
- SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
- };
-
- var registry = new PersistenceRegistry();
-
- // Call
- MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
-
- // Assert
- Assert.IsNotNull(entity);
- MacroStabilityInwardsSemiProbabilisticOutputEntity outputEntity = entity.MacroStabilityInwardsSemiProbabilisticOutputEntities.FirstOrDefault();
- Assert.IsNotNull(outputEntity);
-
- MacroStabilityInwardsSemiProbabilisticOutput expectedOutput = scenario.SemiProbabilisticOutput;
- Assert.AreEqual(expectedOutput.FactorOfStability, outputEntity.FactorOfStability, expectedOutput.FactorOfStability.GetAccuracy());
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsProbability, outputEntity.MacroStabilityInwardsProbability);
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsReliability, outputEntity.MacroStabilityInwardsReliability, expectedOutput.MacroStabilityInwardsReliability.GetAccuracy());
- Assert.AreEqual(expectedOutput.RequiredProbability, outputEntity.RequiredProbability);
- Assert.AreEqual(expectedOutput.RequiredReliability, outputEntity.RequiredReliability, expectedOutput.RequiredReliability.GetAccuracy());
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsFactorOfSafety, outputEntity.MacroStabilityInwardsFactorOfSafety, expectedOutput.MacroStabilityInwardsFactorOfSafety.GetAccuracy());
- }
}
}
\ No newline at end of file
Fisheye: Tag d1519950f365a9a8d3f4f75186f73e98a6ac6b51 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputCreateExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rcc98f3bc7734296dd2d3bd2ed62b5be531948e0f -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision cc98f3bc7734296dd2d3bd2ed62b5be531948e0f)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -1530,8 +1530,6 @@
AssertMacroStabilityInwardsOutput(expectedMacroStabilityInwardsCalculation.Output,
actualMacroStabilityInwardsCalculation.Output);
- AssertMacroStabilityInwardsSemiProbabilisticOutput(expectedMacroStabilityInwardsCalculation.SemiProbabilisticOutput,
- actualMacroStabilityInwardsCalculation.SemiProbabilisticOutput);
}
private static void AssertMacroStabilityInwardsInput(MacroStabilityInwardsInput expectedInput, MacroStabilityInwardsInput actualInput)
@@ -1708,24 +1706,6 @@
Assert.AreEqual(expectedSlice.Weight, actualSlice.Weight);
}
- private static void AssertMacroStabilityInwardsSemiProbabilisticOutput(MacroStabilityInwardsSemiProbabilisticOutput expectedOutput,
- MacroStabilityInwardsSemiProbabilisticOutput actualOutput)
- {
- if (expectedOutput == null)
- {
- Assert.IsNull(actualOutput);
- }
- else
- {
- Assert.AreEqual(expectedOutput.FactorOfStability, actualOutput.FactorOfStability);
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsProbability, actualOutput.MacroStabilityInwardsProbability);
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsReliability, actualOutput.MacroStabilityInwardsReliability);
- Assert.AreEqual(expectedOutput.RequiredProbability, actualOutput.RequiredProbability);
- Assert.AreEqual(expectedOutput.RequiredReliability, actualOutput.RequiredReliability);
- Assert.AreEqual(expectedOutput.MacroStabilityInwardsFactorOfSafety, actualOutput.MacroStabilityInwardsFactorOfSafety);
- }
- }
-
#endregion
#region GrassCoverErosionInwards FailureMechanism
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r8d246ac6328e6e649ff6e78dfe3fac210d789ba0 -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs) (revision 8d246ac6328e6e649ff6e78dfe3fac210d789ba0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs (.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -127,7 +127,6 @@
MacroStabilityInwardsCalculationScenario calculation = entity.Read(collector);
// Assert
- Assert.IsNull(calculation.SemiProbabilisticOutput);
Assert.IsNull(calculation.Output);
Assert.AreEqual(entity.Name, calculation.Name);
Assert.AreEqual(entity.Comment, calculation.Comments.Body);
@@ -151,7 +150,6 @@
MacroStabilityInwardsCalculationScenario calculation = entity.Read(collector);
// Assert
- Assert.IsNull(calculation.SemiProbabilisticOutput);
Assert.IsNull(calculation.Output);
Assert.IsNull(calculation.Comments.Body);
@@ -236,7 +234,7 @@
}
[Test]
- public void Read_EntityWithSemiProbabilisticOutput_ReturnsCalculationScenarioWithSemiProbabilisticOutput()
+ public void Read_EntityWithOutput_ReturnsCalculationScenarioWithOutput()
{
// Setup
var random = new Random(31);
@@ -267,30 +265,6 @@
MacroStabilityInwardsCalculationOutputEntityTestHelper.AssertOutputPropertyValues(output, calculationOutputEntity);
}
- [Test]
- public void Read_EntityWithOutput_ReturnsCalculationScenarioWithOutput()
- {
- // Setup
- MacroStabilityInwardsCalculationEntity entity = CreateValidCalculationEntity();
- entity.MacroStabilityInwardsSemiProbabilisticOutputEntities.Add(new MacroStabilityInwardsSemiProbabilisticOutputEntity());
-
- var collector = new ReadConversionCollector();
-
- // Call
- MacroStabilityInwardsCalculationScenario calculation = entity.Read(collector);
-
- // Assert
- MacroStabilityInwardsSemiProbabilisticOutput output = calculation.SemiProbabilisticOutput;
- Assert.IsNotNull(output);
-
- Assert.IsNaN(output.FactorOfStability);
- Assert.IsNaN(output.RequiredProbability);
- Assert.IsNaN(output.RequiredReliability);
- Assert.IsNaN(output.MacroStabilityInwardsFactorOfSafety);
- Assert.IsNaN(output.MacroStabilityInwardsProbability);
- Assert.IsNaN(output.MacroStabilityInwardsReliability);
- }
-
private static MacroStabilityInwardsCalculationEntity CreateValidCalculationEntity()
{
var random = new Random(21);
Fisheye: Tag d1519950f365a9a8d3f4f75186f73e98a6ac6b51 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSemiProbabilisticOutputEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r53fa30076e4e6576728f01a8dfff7314889ddb3a -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 53fa30076e4e6576728f01a8dfff7314889ddb3a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
@@ -1378,8 +1378,6 @@
ZoneBoundaryRight = (RoundedDouble) 12
},
Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
- SemiProbabilisticOutput = new MacroStabilityInwardsSemiProbabilisticOutput(1, 0.7, 8.8, 0.9,
- 10.10, 11.11)
},
new MacroStabilityInwardsCalculationScenario
{
@@ -1462,7 +1460,6 @@
ZoneBoundaryRight = (RoundedDouble) 6.5
},
Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
- SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
}
}
});
@@ -1540,8 +1537,7 @@
ZoneBoundaryLeft = (RoundedDouble) 1,
ZoneBoundaryRight = (RoundedDouble) 2
},
- Output = null,
- SemiProbabilisticOutput = null
+ Output = null
});
}