From ebcbd47f91bbaf01267662d2e9f396284bb7984a Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Fri, 13 Jan 2023 09:23:45 +0100
Subject: [PATCH] PruefungsNr calculation that uses OraIdRepetMulti /
 RawDataIdRepetMulti modified, ver. 2.31.2002

---
 TBF/Properties/AssemblyInfo.cs                                | 4 ++--
 TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs              | 2 +-
 TBF/Rig/Output/LUTestData.cs                                  | 2 +-
 TBF/Rig/Output/LUTestDataComparer.cs                          | 4 ++--
 TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index b8dbb05d1..94d420f1d 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.31.2001.0")]
-[assembly: AssemblyFileVersion("2.31.2001.0")]
+[assembly: AssemblyVersion("2.31.2002.0")]
+[assembly: AssemblyFileVersion("2.31.2002.0")]
diff --git a/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs b/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs
index 7430d5f1b..63a895b0f 100644
--- a/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs
+++ b/TBF/Rig/Output/FileWriters/IperlLogger/Writer.cs
@@ -220,7 +220,7 @@ namespace TBF.Rig.Output.FileWriters.IperlLogger
             {
                 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)
                     {
                         testsToSave.Add(new LUTestData(td, repNr));
diff --git a/TBF/Rig/Output/LUTestData.cs b/TBF/Rig/Output/LUTestData.cs
index 9ae9274ba..727c3c8d4 100644
--- a/TBF/Rig/Output/LUTestData.cs
+++ b/TBF/Rig/Output/LUTestData.cs
@@ -20,7 +20,7 @@ namespace TBF.Rig.Output
             RepNr = repNr;
             TestName = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr);
 #if ORACLE_DB
-            Id = tData.OraId + repNr * tData.OraIdRepetMulti;
+            Id = tData.OraId + (tData.Repeats - repNr) * tData.OraIdRepetMulti;
             if (string.IsNullOrEmpty(tData.OraDesignation))
             {
                 Designation = Common.Utils.GetTestName(tData.Name, tData.Repeats, repNr);
diff --git a/TBF/Rig/Output/LUTestDataComparer.cs b/TBF/Rig/Output/LUTestDataComparer.cs
index 0dbad5340..48b00ce71 100644
--- a/TBF/Rig/Output/LUTestDataComparer.cs
+++ b/TBF/Rig/Output/LUTestDataComparer.cs
@@ -29,8 +29,8 @@ namespace TBF.Rig.Output
             var trY = y as LUTestData;
             if (trX == null || trY == null) return 0;
 
-            int idX = trX.TData.OraId + trX.RepNr * trX.TData.OraIdRepetMulti;
-            int idY = trY.TData.OraId + trY.RepNr * trY.TData.OraIdRepetMulti;
+            int idX = trX.TData.OraId + (trX.TData.Repeats - trX.RepNr) * trX.TData.OraIdRepetMulti;
+            int idY = trY.TData.OraId + (trY.TData.Repeats - trY.RepNr) * trY.TData.OraIdRepetMulti;
             int valX = (idX > 0) ? int.MaxValue - idX : idX;
             int valY = (idY > 0) ? int.MaxValue - idY : idY;
             return order == SortOrder.Descending ? (valY - valX) : (valX - valY);
diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
index 82d082a05..05fdfb139 100644
--- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
+++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlHead/IperlHead.cs
@@ -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);
 
 #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"),
                                                         StateMachine.CycleStartTimeStamp.ToString("MM"),
@@ -752,7 +752,7 @@ namespace TBF.Rig.TestMethods.iPerlCommunication.iPerlHead
             string cycleStartTime = StateMachine.CycleStartTimeStamp.ToString("HH_mm_ss");
 #if ORACLE_DB
             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)
                                ? testId.ToString(testId > 0 ? "D2" : "D1")                                  /// Name is generated from Id
                                : (designations.Length > repetitionNr - 1) ? designations[repetitionNr - 1]  /// Name is from 'RawDataDesignation' parameter