Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rc37eebd9171a53987f5929013edbe3d82e618ed0 -rafc975f0825593fb82a4159d5ca6327d95eff20a
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c37eebd9171a53987f5929013edbe3d82e618ed0)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision afc975f0825593fb82a4159d5ca6327d95eff20a)
@@ -749,24 +749,6 @@
}
///
- /// Looks up a localized string similar to De veiligheidsfactor voor deze berekening..
- ///
- public static string PipingOutput_PipingFactorOfSafety_Description {
- get {
- return ResourceManager.GetString("PipingOutput_PipingFactorOfSafety_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Veiligheidsfactor [-].
- ///
- public static string PipingOutput_PipingFactorOfSafety_DisplayName {
- get {
- return ResourceManager.GetString("PipingOutput_PipingFactorOfSafety_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De benaderde kans dat het toetsspoor piping optreedt voor deze berekening..
///
public static string PipingOutput_PipingProbability_Description {
@@ -803,42 +785,6 @@
}
///
- /// Looks up a localized string similar to De maximaal toegestane kans dat het toetsspoor piping optreedt..
- ///
- public static string PipingOutput_RequiredProbability_Description {
- get {
- return ResourceManager.GetString("PipingOutput_RequiredProbability_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Faalkanseis [1/jaar].
- ///
- public static string PipingOutput_RequiredProbability_DisplayName {
- get {
- return ResourceManager.GetString("PipingOutput_RequiredProbability_DisplayName", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping..
- ///
- public static string PipingOutput_RequiredReliability_Description {
- get {
- return ResourceManager.GetString("PipingOutput_RequiredReliability_Description", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Betrouwbaarheidsindex faalkanseis [-].
- ///
- public static string PipingOutput_RequiredReliability_DisplayName {
- get {
- return ResourceManager.GetString("PipingOutput_RequiredReliability_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to De verhouding tussen de kwelweglengte en het berekende kritieke verval op basis van de regel van Sellmeijer (analoog aan de vuistregel van Bligh)..
///
public static string PipingOutput_SellmeijerCreepCoefficient_Description {
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx
===================================================================
diff -u -r6a1093e75bdf23c60232116445c086ebb5319558 -rafc975f0825593fb82a4159d5ca6327d95eff20a
--- Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6a1093e75bdf23c60232116445c086ebb5319558)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision afc975f0825593fb82a4159d5ca6327d95eff20a)
@@ -271,12 +271,6 @@
Uittredepunt
-
- De veiligheidsfactor voor deze berekening.
-
-
- Veiligheidsfactor [-]
-
De kans dat het submechanisme heave optreedt voor deze berekening.
@@ -307,18 +301,6 @@
Betrouwbaarheidsindex faalkans [-]
-
- De maximaal toegestane kans dat het toetsspoor piping optreedt.
-
-
- Faalkanseis [1/jaar]
-
-
- De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.
-
-
- Betrouwbaarheidsindex faalkanseis [-]
-
De kans dat het submechanisme terugschrijdende erosie (Sellmeijer) optreedt voor deze berekening.
Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs
===================================================================
diff -u -raadbaf228b074ae1d2a2ec3163a5705fc2bf69e0 -rafc975f0825593fb82a4159d5ca6327d95eff20a
--- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs (.../SemiProbabilisticPipingOutputProperties.cs) (revision aadbaf228b074ae1d2a2ec3163a5705fc2bf69e0)
+++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputProperties.cs (.../SemiProbabilisticPipingOutputProperties.cs) (revision afc975f0825593fb82a4159d5ca6327d95eff20a)
@@ -238,33 +238,9 @@
}
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_RequiredProbability_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_RequiredProbability_Description))]
- [PropertyOrder(31)]
- public string RequiredProbability
- {
- get
- {
- return ProbabilityFormattingHelper.Format(derivedOutput.RequiredProbability);
- }
- }
-
- [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_RequiredReliability_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_RequiredReliability_Description))]
- [PropertyOrder(32)]
- public RoundedDouble RequiredReliability
- {
- get
- {
- return derivedOutput.RequiredReliability;
- }
- }
-
- [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingProbability_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingProbability_Description))]
- [PropertyOrder(33)]
+ [PropertyOrder(31)]
public string PipingProbability
{
get
@@ -276,7 +252,7 @@
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingReliability_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingReliability_Description))]
- [PropertyOrder(34)]
+ [PropertyOrder(32)]
public RoundedDouble PipingReliability
{
get
@@ -285,18 +261,6 @@
}
}
- [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Piping), 4, 4)]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.PipingOutput_PipingFactorOfSafety_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.PipingOutput_PipingFactorOfSafety_Description))]
- [PropertyOrder(35)]
- public RoundedDouble PipingFactorOfSafety
- {
- get
- {
- return derivedOutput.PipingFactorOfSafety;
- }
- }
-
private void CreateDerivedOutput(SemiProbabilisticPipingOutput output, PipingFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
{
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs
===================================================================
diff -u -raadbaf228b074ae1d2a2ec3163a5705fc2bf69e0 -rafc975f0825593fb82a4159d5ca6327d95eff20a
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision aadbaf228b074ae1d2a2ec3163a5705fc2bf69e0)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingOutputPropertiesTest.cs (.../SemiProbabilisticPipingOutputPropertiesTest.cs) (revision afc975f0825593fb82a4159d5ca6327d95eff20a)
@@ -76,10 +76,10 @@
public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
{
// Call
- TestDelegate call = () => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), new PipingFailureMechanism(), null);
+ void Call() => new SemiProbabilisticPipingOutputProperties(PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput(), new PipingFailureMechanism(), null);
// Assert
- var exception = Assert.Throws(call);
+ var exception = Assert.Throws(Call);
Assert.AreEqual("assessmentSection", exception.ParamName);
}
@@ -150,11 +150,8 @@
Assert.AreEqual(sellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety, properties.SellmeijerFactorOfSafety.GetAccuracy());
Assert.AreEqual(expectedDerivedOutput.SellmeijerReliability, properties.SellmeijerReliability, properties.SellmeijerReliability.GetAccuracy());
Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedDerivedOutput.SellmeijerProbability), properties.SellmeijerProbability);
- Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedDerivedOutput.RequiredProbability), properties.RequiredProbability);
- Assert.AreEqual(expectedDerivedOutput.RequiredReliability, properties.RequiredReliability, properties.RequiredReliability.GetAccuracy());
Assert.AreEqual(ProbabilityFormattingHelper.Format(expectedDerivedOutput.PipingProbability), properties.PipingProbability);
Assert.AreEqual(expectedDerivedOutput.PipingReliability, properties.PipingReliability, properties.PipingReliability.GetAccuracy());
- Assert.AreEqual(expectedDerivedOutput.PipingFactorOfSafety, properties.PipingFactorOfSafety, properties.PipingFactorOfSafety.GetAccuracy());
Assert.AreEqual(upliftEffectiveStress, properties.UpliftEffectiveStress, properties.UpliftEffectiveStress.GetAccuracy());
Assert.AreEqual(heaveGradient, properties.HeaveGradient, properties.HeaveGradient.GetAccuracy());
@@ -179,7 +176,7 @@
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
- Assert.AreEqual(19, dynamicProperties.Count);
+ Assert.AreEqual(16, dynamicProperties.Count);
const string heaveCategory = "\t\tHeave";
const string upliftCategory = "\t\t\tOpbarsten";
@@ -284,40 +281,20 @@
"De kans dat het submechanisme terugschrijdende erosie (Sellmeijer) optreedt voor deze berekening.",
true);
- PropertyDescriptor requiredProbabilityProperty = dynamicProperties[14];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredProbabilityProperty,
- pipingCategory,
- "Faalkanseis [1/jaar]",
- "De maximaal toegestane kans dat het toetsspoor piping optreedt.",
- true);
-
- PropertyDescriptor requiredReliabilityProperty = dynamicProperties[15];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(requiredReliabilityProperty,
- pipingCategory,
- "Betrouwbaarheidsindex faalkanseis [-]",
- "De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.",
- true);
-
- PropertyDescriptor pipingProbabilityProperty = dynamicProperties[16];
+ PropertyDescriptor pipingProbabilityProperty = dynamicProperties[14];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(pipingProbabilityProperty,
pipingCategory,
"Benaderde faalkans [1/jaar]",
"De benaderde kans dat het toetsspoor piping optreedt voor deze berekening.",
true);
- PropertyDescriptor pipingReliabilityProperty = dynamicProperties[17];
+ PropertyDescriptor pipingReliabilityProperty = dynamicProperties[15];
PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(pipingReliabilityProperty,
pipingCategory,
"Betrouwbaarheidsindex faalkans [-]",
"De betrouwbaarheidsindex van de faalkans voor deze berekening.",
true);
- PropertyDescriptor pipingFactorOfSafetyProperty = dynamicProperties[18];
- PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(pipingFactorOfSafetyProperty,
- pipingCategory,
- "Veiligheidsfactor [-]",
- "De veiligheidsfactor voor deze berekening.",
- true);
mocks.VerifyAll();
}
}