michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SensusTestInfo fixes for repeatability and EMP, ver. 2.18.1184

Browse Source
This commit is contained in:
Milan Hanajik
2019-04-04 14:23:50 +02:00
parent 809b067260
commit 32d560d164
4 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/BenchControl/Output/DB/SensusOracle/Database.cs
+5 -4
View File
@@ -492,24 +492,25 @@ namespace TBF.BenchControl.Output.DB.SensusOracle
double error = dr.GetDouble(i++);
bool testPassed = (dr.GetInt32(i++) != 0);
string testName = null;
string baseTestName = null;
foreach (var ti in completeTestInfo)
{
if (ti.PruefungsNrDB == testId)
{
testName = ti.TestName;
int ix = ti.TestName.LastIndexOf(" (");
baseTestName = (ix < 0) ? ti.TestName : ti.TestName.Substring(0, ix);
break;
}
}
if (!string.IsNullOrEmpty(testName))
if (!string.IsNullOrEmpty(baseTestName))
{
foreach (var mtr in wm.MeterTestRslts)
{
string mtrTestName = mtr.TestRslt.Name();
int ix = mtrTestName.LastIndexOf(" (");
string mtrBaseTestName = (ix < 0) ? mtrTestName : mtrTestName.Substring(0, ix);
if (mtrBaseTestName == testName)
if (mtrBaseTestName == baseTestName)
{
mtr.LastError = error;
}
TBF/BenchControl/Output/SensusTestInfo.cs
+57 -57
View File
@@ -248,83 +248,83 @@ namespace TBF.BenchControl.Output
case LogType.Suez_Repeatability:
return new SensusTestInfo[]
{
new SensusTestInfo("Q3_lr (1/3)", 9, "Q3", 9, "09", 9, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (2/3)", 8, "Q3", 8, "08", 8, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (3/3)", 7, "Q3", 7, "07", 7, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr (1/3)", 6, "Q2", 6, "06", 6, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_lr (2/3)", 5, "Q2", 5, "05", 5, "Q2", Range.R100_110),
new SensusTestInfo("Q2ac_lr (3/3)", 4, "Q2", 4, "04", 4, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr (1/3)", 3, "Q1", 3, "03", 3, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (2/3)", 2, "Q1", 2, "02", 2, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (3/3)", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
new SensusTestInfo("Q3_lr (1/3)", 5, "Q3", 9, "09", 9, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (2/3)", 5, "Q3", 8, "08", 8, "Q3", Range.R90_100),
new SensusTestInfo("Q3_lr (3/3)", 5, "Q3", 7, "07", 7, "Q3", Range.R90_100),
new SensusTestInfo("Q2ac_lr (1/3)", 2, "Q2ac", 6, "06", 6, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (2/3)", 2, "Q2ac", 5, "05", 5, "Q2ac", Range.R100_110),
new SensusTestInfo("Q2ac_lr (3/3)", 2, "Q2ac", 4, "04", 4, "Q2ac", Range.R100_110),
new SensusTestInfo("Q1_lr (1/3)", 1, "Q1", 3, "03", 3, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (2/3)", 1, "Q1", 2, "02", 2, "Q1", Range.R100_110),
new SensusTestInfo("Q1_lr (3/3)", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN15:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 0, "", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q1.35", 0, "", 10, "10", 10, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 9, "09", 9, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 8, "08", 8, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 7, "07", 7, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 6, "06", 6, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 5, "05", 5, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.0236", 0, "", 4, "04", 4, "Q0.0236", Range.R95_105),
new SensusTestInfo("Q0.010", 0, "", 3, "03", 3, "Q0.010", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 0, "", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 0, "", 1, "01", 1, "Q1", Range.R100_110),
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q1.35", 0, "", 10, "10", 10, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 9, "09", 9, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 8, "08", 8, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 7, "07", 7, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 6, "06", 6, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 5, "05", 5, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.0236", 0, "", 4, "04", 4, "Q0.0236", Range.R95_105),
new SensusTestInfo("Q0.010", 0, "", 3, "03", 3, "Q0.010", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN20:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 0, "", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q2.16", 0, "", 10, "10", 10, "Q2.16", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 9, "09", 9, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 8, "08", 8, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 7, "07", 7, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 6, "06", 6, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 5, "05", 5, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 4, "04", 4, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.02", 0, "", 3, "03", 3, "Q0.02", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 0, "", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 0, "", 1, "01", 1, "Q1", Range.R100_110),
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q2.16", 0, "", 10, "10", 10, "Q2.16", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 9, "09", 9, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.7", 0, "", 8, "08", 8, "Q0.7", Range.R95_105),
new SensusTestInfo("Q0.28", 0, "", 7, "07", 7, "Q0.28", Range.R95_105),
new SensusTestInfo("Q0.15", 0, "", 6, "06", 6, "Q0.15", Range.R95_105),
new SensusTestInfo("Q0.08", 0, "", 5, "05", 5, "Q0.08", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 4, "04", 4, "Q0.04", Range.R95_105),
new SensusTestInfo("Q0.02", 0, "", 3, "03", 3, "Q0.02", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN32:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 0, "", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q5", 0, "", 10, "10", 10, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 9, "09", 9, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 8, "08", 8, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 7, "07", 7, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 6, "06", 6, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 5, "05", 5, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 4, "04", 4, "Q0.09", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 3, "03", 3, "Q0.04", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 0, "", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 0, "", 1, "01", 1, "Q1", Range.R100_110),
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q5", 0, "", 10, "10", 10, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 9, "09", 9, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 8, "08", 8, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 7, "07", 7, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 6, "06", 6, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 5, "05", 5, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 4, "04", 4, "Q0.09", Range.R95_105),
new SensusTestInfo("Q0.04", 0, "", 3, "03", 3, "Q0.04", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
case LogType.Suez_EMP_DN40:
return new SensusTestInfo[]
{
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 0, "", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q8", 0, "", 10, "10", 10, "Q8", Range.R95_105),
new SensusTestInfo("Q5", 0, "", 9, "09", 9, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 8, "08", 8, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 7, "07", 7, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 6, "06", 6, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 5, "05", 5, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 4, "04", 4, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 3, "03", 3, "Q0.09", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 0, "", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 0, "", 1, "01", 1, "Q1", Range.R100_110),
new SensusTestInfo("Q4", 0, "", 12, "12", 12, "Q4", Range.R90_100),
new SensusTestInfo("Q3_lr", 5, "Q3", 11, "11", 11, "Q3", Range.R90_100),
new SensusTestInfo("Q8", 0, "", 10, "10", 10, "Q8", Range.R95_105),
new SensusTestInfo("Q5", 0, "", 9, "09", 9, "Q5", Range.R95_105),
new SensusTestInfo("Q2.5", 0, "", 8, "08", 8, "Q2.5", Range.R95_105),
new SensusTestInfo("Q1.35", 0, "", 7, "07", 7, "Q1.35", Range.R95_105),
new SensusTestInfo("Q0.65", 0, "", 6, "06", 6, "Q0.65", Range.R95_105),
new SensusTestInfo("Q0.35", 0, "", 5, "05", 5, "Q0.35", Range.R95_105),
new SensusTestInfo("Q0.16", 0, "", 4, "04", 4, "Q0.16", Range.R95_105),
new SensusTestInfo("Q0.09", 0, "", 3, "03", 3, "Q0.09", Range.R95_105),
new SensusTestInfo("Q2ac_lr", 2, "Q2ac", 2, "02", 2, "Q2", Range.R100_110),
new SensusTestInfo("Q1_lr", 1, "Q1", 1, "01", 1, "Q1", Range.R100_110),
};
}
}
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("2.18.1183.0")]
[assembly: AssemblyFileVersion("2.18.1183.0")]
[assembly: AssemblyVersion("2.18.1184.0")]
[assembly: AssemblyFileVersion("2.18.1184.0")]