Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadResultsforFMFromResultView.cs
===================================================================
diff -u -r5c4cba364ae4a0f38505a4ac89c0ec9a9e7941d4 -rabfb27f458331f15ca807d0458a9029c6b9553f0
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadResultsforFMFromResultView.cs (.../ReadResultsforFMFromResultView.cs) (revision 5c4cba364ae4a0f38505a4ac89c0ec9a9e7941d4)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ReadResultsforFMFromResultView.cs (.../ReadResultsforFMFromResultView.cs) (revision abfb27f458331f15ca807d0458a9029c6b9553f0)
@@ -100,26 +100,6 @@
foreach (var row in rowsData) {
var cellsDataInRow = row.Cells.ToList();
currentFMResultInformation.SectionList[rowIndex].CalculationFailureProbPerSection = GetAccValue(cellsDataInRow[sectionColumnIndeces[1]]);
- if (sectionColumnIndeces[0]!=-1) {
- currentFMResultInformation.SectionList[rowIndex].CalculationFailureProbPerProfile = GetAccValue(cellsDataInRow[sectionColumnIndeces[0]]);
- } else {
- var denominatorCalculationFailureProbPerSection = GetAccValue(cellsDataInRow[sectionColumnIndeces[1]]).ToNoGroupSeparator().Substring(2);
- double numericCalculationFailureProbPerSection;
- string fractionCalculationFailureProbPerProfile;
- if (denominatorCalculationFailureProbPerSection=="Oneindig") {
- fractionCalculationFailureProbPerProfile = "1/Oneindig";
- } else {
- numericCalculationFailureProbPerSection = 1.0 / Double.Parse(denominatorCalculationFailureProbPerSection);
- var numericNParemeterFM = Double.Parse(N_FM);
- var numericCalculationFailureProbPerProfile = numericCalculationFailureProbPerSection * numericNParemeterFM;
- fractionCalculationFailureProbPerProfile = "1/" + Convert.ToInt32(1.0/numericCalculationFailureProbPerProfile).ToString();
- }
-
-
- currentFMResultInformation.SectionList[rowIndex].CalculationFailureProbPerProfile = fractionCalculationFailureProbPerProfile;
- }
-
-
currentFMResultInformation.SectionList[rowIndex].AssemblyGroup = GetAccValue(cellsDataInRow[sectionColumnIndeces[2]]);
rowIndex++;
}
Index: System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateFailureProbabilityFMInResultView.cs
===================================================================
diff -u -rd9232fa22f0af051de3367b1f7503641517f1c13 -rabfb27f458331f15ca807d0458a9029c6b9553f0
--- System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateFailureProbabilityFMInResultView.cs (.../ValidateFailureProbabilityFMInResultView.cs) (revision d9232fa22f0af051de3367b1f7503641517f1c13)
+++ System tests/AutomatedSystemTests/AutomatedSystemTests/Modules/ActionsDocumentView/ValidateFailureProbabilityFMInResultView.cs (.../ValidateFailureProbabilityFMInResultView.cs) (revision abfb27f458331f15ca807d0458a9029c6b9553f0)
@@ -120,7 +120,7 @@
private double CalculateExpectedFailureProbFM(FailureMechanismResultInformation fmResultInfo)
{
- return Math.Min(PCombin1(fmResultInfo), PCombin2(fmResultInfo));
+ return PCombin1(fmResultInfo);
}
private double PCombin1(FailureMechanismResultInformation fmResultInfo)
@@ -135,16 +135,6 @@
double failureProbFMMech1 = 1.0-productInverseFailureProbability;
return failureProbFMMech1;
}
-
- private double PCombin2(FailureMechanismResultInformation fmResultInfo)
- {
- var maxPdsn = fmResultInfo.SectionList.Select(sc=>sc.CalculationFailureProbPerProfile).
- Select(fraction=>fraction.Substring(2).ToNoGroupSeparator()).
- Where(denom=>denom!="Oneindig").
- Select(denom=> 1.0/Double.Parse(denom)).Max();
- var probMechanism2 = maxPdsn*Double.Parse(N_FM);
- return probMechanism2;
- }
}
}
Index: System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/FailureMechanismsHelpers.cs
===================================================================
diff -u -r08bfbf5e4ec2bdb5d24e210fb14392ffafaca5e9 -rabfb27f458331f15ca807d0458a9029c6b9553f0
--- System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/FailureMechanismsHelpers.cs (.../FailureMechanismsHelpers.cs) (revision 08bfbf5e4ec2bdb5d24e210fb14392ffafaca5e9)
+++ System tests/AutomatedSystemTests/RanorexAutomationHelpers/UserCodeCollections/FailureMechanismsHelpers.cs (.../FailureMechanismsHelpers.cs) (revision abfb27f458331f15ca807d0458a9029c6b9553f0)
@@ -35,11 +35,6 @@
public string AssemblyGroup {get; set;}
///
- /// Probability associated to the combined assessment of the profile (it exists for some FMs).
- ///
- public string CalculationFailureProbPerProfile {get; set;}
-
- ///
/// Probability associated to the combined assessment of the section (it exists for some FMs).
///
public string CalculationFailureProbPerSection {get; set;}