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

Execute(...) arguments changed everywhere, repetitionNr usage depends on outerLoopMode, outerLoopCounter, ver. 2.12.412

Browse Source
This commit is contained in:
Milan Hanajik
2016-12-10 13:03:35 +01:00
parent f9888a2108
commit 216e08d57c
31 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Compound/Component.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Compound
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter)
{
return (new FlyingStartMassCollectionSeq()).Execute(test, testMethodCfg.TestParams, null, DebugLevel);
return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, testMethodCfg.TestParams, null, DebugLevel);
}
}
}
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+3 -3
View File
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
/// Event.OpArgumentError . Target flow is out of range
/// Event.Error . . . . . . Unspecified error
/// </returns>
public IList<Event> Execute(Config.Entities.Test test,
public IList<Event> Execute(Config.Entities.Test test, bool outerLoopMode, int outerLoopCounter,
Compound.CombinedTestParams compoundTestParams,
HeatMeters.TestParams heatMetersTestParams,
Config.Entities.DebugMode debugLevel)
@@ -99,7 +99,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
LtrPerRefPulse = outPath.FlowMeter.LtrPerPulse;
int totalPulses = (int)(test.Volume / LtrPerRefPulse + 0.5f);
int repetitionNr = 1; /// First test: repetitionNr = 1
int repetitionNr = outerLoopMode ? outerLoopCounter : 1; /// First test: repetitionNr = 1
//====================================
// Transition or SetRoute - Start
@@ -910,7 +910,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
/// Append the results to the CSV-file
allResults.Info(TestResult2CsvLine(testName, test.Part));
if (++repetitionNr <= test.Repeats)
if (!outerLoopMode && (++repetitionNr <= test.Repeats))
{
goto loop;
}
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/Component.cs
+1 -1
View File
@@ -35,7 +35,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter)
{
return (new FlyingStartMassCollectionSeq()).Execute(test, null, testMethodCfg.TestParams, DebugLevel);
return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, testMethodCfg.TestParams, DebugLevel);
}
}
}
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/Single/Component.cs
+1 -1
View File
@@ -32,7 +32,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.Single
public IList<Event> Execute(Test test, bool outerLoopMode, int outerLoopCounter)
{
return (new FlyingStartMassCollectionSeq()).Execute(test, null, null, DebugLevel);
return (new FlyingStartMassCollectionSeq()).Execute(test, outerLoopMode, outerLoopCounter, null, null, DebugLevel);
}
}
}