diff --git a/TBF/BenchControl/Sequences/ProcessData.cs b/TBF/BenchControl/Sequences/ProcessData.cs
index 0752e2109..ebc00e59b 100644
--- a/TBF/BenchControl/Sequences/ProcessData.cs
+++ b/TBF/BenchControl/Sequences/ProcessData.cs
@@ -103,27 +103,27 @@ namespace TBF.BenchControl.Sequences
public static int machineTimeStart;
public static int lastMachineTime;
- protected static void StartNewStatistics(int machineTime, int batchNr, string testName, int repetition)
+ protected static void StartNewStatistics(int machineTime, int batchNr, string testName, int repetition, int skippedSamplesCount)
{
machineTimeStart = machineTime;
- lastMachineTime = machineTime;
+ lastMachineTime = machineTime;
- AmbTempStat.Start(batchNr, testName, repetition);
+ AmbTempStat.Start (batchNr, testName, repetition);
AmbPressStat.Start(batchNr, testName, repetition);
- AmbHumiStat.Start(batchNr, testName, repetition);
+ AmbHumiStat.Start (batchNr, testName, repetition);
- TempUpStat.Start(batchNr, testName, repetition);
- TempDownStat.Start(batchNr, testName, repetition);
- TempDiffStat.Start(batchNr, testName, repetition);
- TempDivStat.Start(batchNr, testName, repetition);
- PressUpStat.Start(batchNr, testName, repetition);
- PressDownStat.Start(batchNr, testName, repetition);
- PressDeltaStat.Start(batchNr, testName, repetition);
- RefFlowStat.Start(batchNr, testName, repetition);
+ TempUpStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ TempDownStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ TempDiffStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ TempDivStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ PressUpStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ PressDownStat.Start (batchNr, testName, repetition, skippedSamplesCount);
+ PressDeltaStat.Start(batchNr, testName, repetition, skippedSamplesCount);
+ RefFlowStat.Start (batchNr, testName, repetition, skippedSamplesCount);
- TempRefHiStat.Start(batchNr, testName, repetition);
- TempRefLoStat.Start(batchNr, testName, repetition);
- Energy.Start(batchNr, testName, repetition);
+ TempRefHiStat.Start (batchNr, testName, repetition);
+ TempRefLoStat.Start (batchNr, testName, repetition);
+ Energy.Start (batchNr, testName, repetition);
VolumeForEnergy.Start(batchNr, testName, repetition);
lastEnergyUpdateTime = 0;
}
diff --git a/TBF/BenchControl/Sequences/Statistics.cs b/TBF/BenchControl/Sequences/Statistics.cs
index edae1889f..7136193b2 100644
--- a/TBF/BenchControl/Sequences/Statistics.cs
+++ b/TBF/BenchControl/Sequences/Statistics.cs
@@ -5,7 +5,7 @@ namespace TBF.BenchControl.Sequences
{
public class Statistics
{
- public readonly int SkippedSamplesCount; /// 0 = do not skip any samples
+ public readonly int DefaultSkippedSamplesCount; /// 0 = do not skip any samples
public readonly int FilterSize; /// 0 = no filter
public readonly bool MedianFilter; /// true - median filter instead of average
public readonly IPlotter plotter;
@@ -18,6 +18,7 @@ namespace TBF.BenchControl.Sequences
double min;
double max;
double sum;
+ int skippedSamplesCount;
int totalCount; /// Number of samples passed to Update()
int count; /// Number of processed and filtered samples
int fifoCount; /// Number of samples inserted into FIFO
@@ -34,9 +35,9 @@ namespace TBF.BenchControl.Sequences
public double Sum { get { return sum; } }
- public Statistics(int skippedSamplesCount, int filterSize, bool medianFilter, IPlotter plotter)
+ public Statistics(int defaultSkippedSamplesCount, int filterSize, bool medianFilter, IPlotter plotter)
{
- this.SkippedSamplesCount = skippedSamplesCount;
+ this.DefaultSkippedSamplesCount = defaultSkippedSamplesCount;
this.FilterSize = filterSize;
this.MedianFilter = medianFilter;
this.plotter = plotter;
@@ -50,8 +51,8 @@ namespace TBF.BenchControl.Sequences
recordingInProgress = false;
}
- public Statistics(int skippedSamplesCount, int filterSize, bool medianFilter)
- : this(skippedSamplesCount, filterSize, medianFilter, new DummyPlotter())
+ public Statistics(int defaultSkippedSamplesCount, int filterSize, bool medianFilter)
+ : this(defaultSkippedSamplesCount, filterSize, medianFilter, new DummyPlotter())
{
}
@@ -69,8 +70,17 @@ namespace TBF.BenchControl.Sequences
///
/// Resets statistics and start collecting
///
- public void Start(int batchNr, string testName, int repetition)
+ public void Start(int batchNr, string testName, int repetition)
+ {
+ Start(batchNr, testName, repetition, DefaultSkippedSamplesCount);
+ }
+
+ ///
+ /// Resets statistics and start collecting, 4th arument specifies skipped samples count
+ ///
+ public void Start(int batchNr, string testName, int repetition, int skippedSamplesCount)
{
+ this.skippedSamplesCount = skippedSamplesCount;
sum = 0;
min = double.MaxValue;
max = double.MinValue;
@@ -124,7 +134,7 @@ namespace TBF.BenchControl.Sequences
{
if (recordingInProgress)
{
- if (totalCount >= SkippedSamplesCount)
+ if (totalCount >= skippedSamplesCount)
{
Process(value);
}
@@ -149,7 +159,7 @@ namespace TBF.BenchControl.Sequences
if (value < min) min = filteredValue;
if (value > max) max = filteredValue;
- plotter.UpdateGraph(graphId, (float)(count + SkippedSamplesCount + FilterSize / 2), (float)value);
+ plotter.UpdateGraph(graphId, (float)(count + skippedSamplesCount + FilterSize / 2), (float)value);
count++;
}
diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
index 6f7712546..e2dff6107 100644
--- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
+++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs
@@ -333,7 +333,7 @@ namespace TBF.BenchControl.TestMethods.Adjustment
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
while (true)
diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
index de4c8eff8..09e1af24b 100644
--- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs
@@ -472,12 +472,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
//--------------------------------
State.Create(string.Format("{0}({1}) : Going to the test flow", test.Method, test.Name))
- //State.Create("set_RV_position",
- .AddOperation(checkUiOp)
- .AddOperations(measureOperations)
- .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_detected, qto_detected, outPath.PidCoef, RefFlow, 600)) /// timeout = 10 sec.
- //.AddOp(pOut.RegulValve.SetPositionOp(35.0f, 38.0f, uint.MaxValue))
- .EnterState();
+ .AddOperation(checkUiOp)
+ .AddOperations(measureOperations)
+ .AddOperation(outPath.RegulValve.SetFlowOp(outPath.FlowMeter, qfrom_detected, qto_detected, outPath.PidCoef, RefFlow, 600)) /// timeout = 10 sec.
+ //.AddOp(pOut.RegulValve.SetPositionOp(35.0f, 38.0f, uint.MaxValue))
+ .EnterState();
do
{
e = StateMachine.WaitRunDevsRunOps();
@@ -534,7 +533,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Read the diverter switch time
diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
index 48c82820d..aa4a2caa7 100644
--- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
+++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs
@@ -277,7 +277,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
queryEnd1 = cBrd.QueryMeasurementEndOp();
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name))
@@ -508,7 +508,7 @@ namespace TBF.BenchControl.TestMethods.Endurance
while (!e.Contains(Event.PreviousStopped));
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
///
diff --git a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
index 9f25512b4..b2736ca76 100644
--- a/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStart/FixedStartSeq.cs
@@ -602,7 +602,7 @@ namespace TBF.BenchControl.TestMethods.FixedStart
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime/10), 5));
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Measurement loop - begin
diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
index f9758bf3d..4cf196b81 100644
--- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs
@@ -354,7 +354,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Measurement loop - begin
diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs
index 5ce2f7c92..d7c48d5d2 100644
--- a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs
@@ -661,7 +661,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Measurement loop - begin
diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
index 803b41355..3a4fed451 100644
--- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
@@ -648,7 +648,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, Math.Max((int)(test.TstTime / 10), 5));
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
/// Measurement loop - begin
diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
index 026897c05..9f85b8bf3 100644
--- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
@@ -426,7 +426,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
queryEnd1 = cBrd.QueryMeasurementEndOp();
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
State.Create("Read water meters")
diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
index 4532ccd9d..712125c88 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs
@@ -610,7 +610,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl
queryEnd1 = cBrd.QueryMeasurementEndOp(); /// ???
int estimtdEndTime = StateMachine.Time + (int)((repetitionNr == 1) ? test.TstTime : (test.TstTime * nextTestVolume / test.Volume));
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name))
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
index 5f5252356..6bcdf6f83 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
@@ -614,7 +614,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name))
diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index b27518b7e..a7cc9a8f0 100644
--- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -106,7 +106,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
/// Simulate flow
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
IntBox remainingTime = new IntBox((int)test.TstTime);
State.Create(string.Format("{0}({1}) : Simulation", test.Method, test.Name))
@@ -664,7 +664,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
readRegistersOp = new Operations.ReadMoreRegistersOp(sensPath.RegisterReaders);
int estimtdEndTime = StateMachine.Time + (int)test.TstTime;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
State.Create(string.Format("{0}({1}) : Reading watermeters", test.Method, test.Name))
diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
index 75f0bc3fa..4b3795ace 100644
--- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs
@@ -121,7 +121,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
pressure_set:
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
UpdateAllStatistics(StateMachine.Time);
startTime = StateMachine.Time;
@@ -216,7 +216,7 @@ namespace TBF.BenchControl.TestMethods.LeakTest
TestStartTime = DateTime.Now;
startTime = StateMachine.Time;
estimtdEndTime = startTime + testParams.DurationLeak;
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
//------------------------------------------------
Bridge.OnActivity(this, Strings.Test_in_progress);
diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
index 787d123c4..f2c25f22e 100644
--- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs
@@ -122,7 +122,7 @@ namespace TBF.BenchControl.TestMethods.PMaxTest
pressure_set:
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
UpdateAllStatistics(StateMachine.Time);
startTime = StateMachine.Time;
diff --git a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
index efba95692..53c7ed871 100644
--- a/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTest/PulsesTestSeq.cs
@@ -333,7 +333,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTest
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
while (true)
diff --git a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
index 7a970a684..c506955d7 100644
--- a/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
+++ b/TBF/BenchControl/TestMethods/PulsesTestManual/PulsesTestManualSeq.cs
@@ -333,7 +333,7 @@ namespace TBF.BenchControl.TestMethods.PulsesTestManual
queryEnd1 = cBrd.QueryMeasurementEndOp();
queryEnd2 = cBrd.QueryMeasurementEndOp();
- StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr);
+ StartNewStatistics(StateMachine.Time, BatchRslts.Batch.BatchNr, test.Name, repetitionNr, 0);
/// Measurement loop - begin
while (true)
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 6e33c46fa..0f2b1814c 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.18.1017.0")]
-[assembly: AssemblyFileVersion("2.18.1017.0")]
+[assembly: AssemblyVersion("2.18.1018.0")]
+[assembly: AssemblyFileVersion("2.18.1018.0")]