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

PruefungsNr calculation that uses OraIdRepetMulti / RawDataIdRepetMulti modified, ver. 2.31.2002

Browse Source
This commit is contained in:
Milan Hanajik 2023-01-13 09:23:45 +01:00
parent 310ed6158a
commit ebcbd47f91
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("2.31.2001.0")] [assembly: AssemblyVersion("2.31.2002.0")]
[assembly: AssemblyFileVersion("2.31.2001.0")] [assembly: AssemblyFileVersion("2.31.2002.0")]

2
TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs
View File

@ -220,7 +220,7 @@ namespace TBF.Rig.Output.FileWriters.IperlLogger
{ {
for (int repNr = 1; repNr <= td.Repeats; repNr++) for (int repNr = 1; repNr <= td.Repeats; repNr++)
{ {
int testId = td.OraId + repNr * td.OraIdRepetMulti; int testId = td.OraId + (td.Repeats - repNr) * td.OraIdRepetMulti;
if (testId != 0) if (testId != 0)
{ {
testsToSave.Add(new LUTestData(td, repNr)); testsToSave.Add(new LUTestData(td, repNr));

2
TBF/Rig/Output/LUTestData.cs
View File

@ -20,7 +20,7 @@ namespace TBF.Rig.Output
RepNr = repNr; RepNr = repNr;
TestName = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr); TestName = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr);
#if ORACLE_DB #if ORACLE_DB
Id = tData.OraId + repNr * tData.OraIdRepetMulti; Id = tData.OraId + (tData.Repeats - repNr) * tData.OraIdRepetMulti;
if (string.IsNullOrEmpty(tData.OraDesignation)) if (string.IsNullOrEmpty(tData.OraDesignation))
{ {
Designation = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr); Designation = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr);

4
TBF/Rig/Output/LUTestDataComparer.cs
View File

@ -29,8 +29,8 @@ namespace TBF.Rig.Output
var trY = y as LUTestData; var trY = y as LUTestData;
if (trX == null || trY == null) return 0; if (trX == null || trY == null) return 0;
int idX = trX.TData.OraId + trX.RepNr * trX.TData.OraIdRepetMulti; int idX = trX.TData.OraId + (trX.TData.Repeats - trX.RepNr) * trX.TData.OraIdRepetMulti;
int idY = trY.TData.OraId + trY.RepNr * trY.TData.OraIdRepetMulti; int idY = trY.TData.OraId + (trY.TData.Repeats - trY.RepNr) * trY.TData.OraIdRepetMulti;
int valX = (idX > 0) ? int.MaxValue - idX : idX; int valX = (idX > 0) ? int.MaxValue - idX : idX;
int valY = (idY > 0) ? int.MaxValue - idY : idY; int valY = (idY > 0) ? int.MaxValue - idY : idY;
return order == SortOrder.Descending ? (valY - valX) : (valX - valY); return order == SortOrder.Descending ? (valY - valX) : (valX - valY);

4
TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
View File

@ -659,7 +659,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
// log.DebugFormat("Feature vector calculation end, save opto-file start: {0:HH:mm:ss.fff}", DateTime.Now); // log.DebugFormat("Feature vector calculation end, save opto-file start: {0:HH:mm:ss.fff}", DateTime.Now);
#if ORACLE_DB #if ORACLE_DB
if (test.RawDataId + repetitionNr * test.RawDataIdRepetMulti != 0) if (test.RawDataId + (test.Repeats - repetitionNr) * test.RawDataIdRepetMulti != 0)
{ {
string relativeDirectory = Path.Combine(StateMachine.CycleStartTimeStamp.ToString("yy"), string relativeDirectory = Path.Combine(StateMachine.CycleStartTimeStamp.ToString("yy"),
StateMachine.CycleStartTimeStamp.ToString("MM"), StateMachine.CycleStartTimeStamp.ToString("MM"),
@ -752,7 +752,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
string cycleStartTime = StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss"); string cycleStartTime = StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss");
#if ORACLE_DB #if ORACLE_DB
string[] designations = string.IsNullOrEmpty(test.RawDataDesignation) ? new string[0] : test.RawDataDesignation.Split(new char[] { '~' }); string[] designations = string.IsNullOrEmpty(test.RawDataDesignation) ? new string[0] : test.RawDataDesignation.Split(new char[] { '~' });
int testId = test.RawDataId + repetitionNr * test.RawDataIdRepetMulti; int testId = test.RawDataId + (test.Repeats - repetitionNr) * test.RawDataIdRepetMulti;
string designation = string.IsNullOrEmpty(test.RawDataDesignation) string designation = string.IsNullOrEmpty(test.RawDataDesignation)
? testId.ToString(testId > 0 ? "D2" : "D1") /// Name is generated from Id ? testId.ToString(testId > 0 ? "D2" : "D1") /// Name is generated from Id
: (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1] /// Name is from 'RawDataDesignation' parameter : (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1] /// Name is from 'RawDataDesignation' parameter