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

Everything works OK after serious changes:

Browse Source 
- all components, componentCfg-s and parameter providers use base classes
 - less boilerplate code, simpler access to test/procedure parameters from code
 - CreateTestParams(test), CreateProcedureParams(procedure) methods added
 - TestBenchSim class is made static, it is not inheritted by any device anymore
This commit is contained in:
Milan Hanajik
2015-01-02 12:51:27 +01:00
parent 752719bd62
commit 94de991bf6
126 changed files with 1117 additions and 1629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/Elde/ControlComSim.cs
+9 -9
View File
@@ -5,7 +5,7 @@ using log4net;
namespace TBF.BenchControl.Elde
{
public class ControlComSim : TestBenchSim, IControlCom
public class ControlComSim : IControlCom
{
private static readonly ILog log = LogManager.GetLogger(typeof(ControlComSim));
public override string ToString() { return string.Format("ControlComSim"); }
@@ -149,7 +149,7 @@ namespace TBF.BenchControl.Elde
this.cmd = cmd;
this.refFlowmtrNr = refFlowmtrNr;
this.route = route;
RouteSim = route;
TestBenchSim.RouteSim = route;
this.totalRefPulses = totalRefPulses;
this.testMethods = testMethods;
this.filterConstant = filterConstant;
@@ -201,7 +201,7 @@ namespace TBF.BenchControl.Elde
public void RunDeviceBefore()
{
base.RunDevice(regulValveNo, refFlowmtrNr, statusP);
TestBenchSim.RunDevice(regulValveNo, refFlowmtrNr, statusP);
log.DebugFormat("refFreq=", referenceFreq);
@@ -217,14 +217,14 @@ namespace TBF.BenchControl.Elde
case Command.Start:
if ((testMethods & TestMethods.Diverter) == TestMethods.Diverter)
{
SetSimDiverter(true);
TestBenchSim.SetSimDiverter(true);
}
break;
case Command.Stop:
if ((testMethods & TestMethods.Diverter) == TestMethods.Diverter)
{
SetSimDiverter(false);
TestBenchSim.SetSimDiverter(false);
}
break;
}
@@ -233,12 +233,12 @@ namespace TBF.BenchControl.Elde
{
case RegulValveMode.TargetFrequency:
float targetFlow = ((regulValveValue[0] + regulValveValue[1]) / 2.0f) * (Qnom / 2000.0f);
UpdateSimFlow(targetFlow);
TestBenchSim.UpdateSimFlow(targetFlow);
//if (referenceFreq < valveValue[0]) referenceFreq += ((float)rand.Next(20) + 10.0f) / 2.0f;
//else if (referenceFreq > valveValue[1]) referenceFreq -= ((float)rand.Next(20) + 10.0f) / 2.0f;
//else referenceFreq += ((float)rand.Next(10) - 5.0f) / 2.0f;
referenceFreq = GetSimFlow() * 2000.0f / Qnom;
referenceFreq = TestBenchSim.GetSimFlow() * 2000.0f / Qnom;
if (referenceFreq < 0) referenceFreq = 0;
if (referenceFreq > 2500) referenceFreq = 2500;
break;
@@ -270,7 +270,7 @@ namespace TBF.BenchControl.Elde
for (int i = 1; i < Program.WMsCount; i++)
{
const float wmPulsesPerLiter = 10.0f;
wMeterPulsesF[i] += errFactor[i] * pwFactor * ((float)rand.Next(100) + 450.0f) * wmPulsesPerLiter * GetSimFlow() / 1800.0f;
wMeterPulsesF[i] += errFactor[i] * pwFactor * ((float)rand.Next(100) + 450.0f) * wmPulsesPerLiter * TestBenchSim.GetSimFlow() / 1800.0f;
wMeterPulses[i] = (int)wMeterPulsesF[i];
}
@@ -283,7 +283,7 @@ namespace TBF.BenchControl.Elde
if (stopTest)
{
SetSimDiverter(false);
TestBenchSim.SetSimDiverter(false);
statusP = (statusP | StatusP.TestCompleted);
statusP = (statusP & ~StatusP.TestInProgress);
}