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

ErrorLimitHi, ErrorLimitLo, EvaluateVolume test parameters added to all heat meters methods.

Browse Source
This commit is contained in:
Milan Hanajik
2016-10-10 14:35:59 +02:00
parent f8331c1c1c
commit 5f21b5ab26
8 changed files with 173 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs
+5 -4
View File
@@ -763,8 +763,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
volumeRslt.TestTime = tstRslt.TestTime; volumeRslt.TestTime = tstRslt.TestTime;
volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef);
volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume ||
&& (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) &&
(volumeRslt.Error <= test.ErrLimHi - test.Uncertainty));
volumeRslt.TestDone = true; volumeRslt.TestDone = true;
} }
@@ -779,8 +780,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection
energyRslt.PulsesMaster = tstRslt.PulsesMaster; /// <----------------- ??? energyRslt.PulsesMaster = tstRslt.PulsesMaster; /// <----------------- ???
energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef);
energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo)
&& (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi);
energyRslt.TestDone = true; energyRslt.TestDone = true;
} }
} }
TestBenchFramework/BenchControl/TestMethods/FixedStartMassCollection/HeatMeters/TestParams.cs
+48 -30
View File
@@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
{ {
public class TestParams : TestParamsBase, IParamsProvider, ITestParams public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{ {
public float TempWarmLo; /// Low limit for warm temperature [C] public float ErrorLimitLo; /// [%]
public float TempWarmHi; /// High limit for warm temperature [C] public float ErrorLimitHi; /// [%]
public float TempColdLo; /// Low limit for cold temperature [C] public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy
public float TempColdHi; /// High limit for cold temperature [C] public float TempWarmLo; /// Low limit for warm temperature [°C]
public float TempWarmHi; /// High limit for warm temperature [°C]
public float TempColdLo; /// Low limit for cold temperature [°C]
public float TempColdHi; /// High limit for cold temperature [°C]
public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe
public float DeltaTempWarm; public float DeltaTempWarm;
public float DeltaTempCold; public float DeltaTempCold;
@@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
string[] paramNames = new string[] string[] paramNames = new string[]
{ {
Strings.Err_limit_neg_pct_chdr,
Strings.Err_limit_pos_pct_chdr,
Strings.Evaluate_volume,
"T warm lo", "T warm lo",
"T warm hi", "T warm hi",
"T cold lo", "T cold lo",
@@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: return TempWarmLo.ToString(); case 0: return ErrorLimitLo.ToString();
case 1: return TempWarmHi.ToString(); case 1: return ErrorLimitHi.ToString();
case 2: return TempColdLo.ToString(); case 2: return (EvaluateVolume ? Strings.yes : Strings.no);
case 3: return TempColdHi.ToString(); case 3: return TempWarmLo.ToString();
case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); case 4: return TempWarmHi.ToString();
case 5: return DeltaTempWarm.ToString(); case 5: return TempColdLo.ToString();
case 6: return DeltaTempCold.ToString(); case 6: return TempColdHi.ToString();
case 7: return ChangeInTimeWarm.ToString(); case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no);
case 8: return ChangeInTimeCold.ToString(); case 8: return DeltaTempWarm.ToString();
case 9: return Prompt; case 9: return DeltaTempCold.ToString();
case 10: return ChangeInTimeWarm.ToString();
case 11: return ChangeInTimeCold.ToString();
case 12: return Prompt;
default: return string.Empty; default: return string.Empty;
} }
} }
@@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return;
case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return;
case 2: TempColdLo = Utils.ParseSFloat(strValue); return; case 2: EvaluateVolume = strValue.Equals(Strings.yes); return;
case 3: TempColdHi = Utils.ParseSFloat(strValue); return; case 3: TempWarmLo = Utils.ParseSFloat(strValue); return;
case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; case 4: TempWarmHi = Utils.ParseSFloat(strValue); return;
case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; case 5: TempColdLo = Utils.ParseSFloat(strValue); return;
case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; case 6: TempColdHi = Utils.ParseSFloat(strValue); return;
case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return;
case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return;
case 9: Prompt = strValue; return; case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return;
case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return;
case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return;
case 12: Prompt = strValue; return;
default: return; default: return;
} }
} }
@@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
{ {
case 0: case 0:
case 1: case 1:
case 2:
case 3: case 3:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 4: case 4:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 5: case 5:
case 6: case 6:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 2:
case 7: case 7:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 8: case 8:
case 9:
case 10:
case 11:
if (Utils.TryParseUFloat(strValue, out dummy)) return true; if (Utils.TryParseUFloat(strValue, out dummy)) return true;
break; break;
case 9: case 12:
return true; return true;
default: default:
message = "Invalid index"; message = "Invalid index";
@@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection.HeatMeters
void CopyContentTo(TestParams prms) void CopyContentTo(TestParams prms)
{ {
prms.ErrorLimitLo = ErrorLimitLo;
prms.ErrorLimitHi = ErrorLimitHi;
prms.EvaluateVolume = EvaluateVolume;
prms.TempWarmLo = TempWarmLo; prms.TempWarmLo = TempWarmLo;
prms.TempWarmHi = TempWarmHi; prms.TempWarmHi = TempWarmHi;
prms.TempColdLo = TempColdLo; prms.TempColdLo = TempColdLo;
TestBenchFramework/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs
+7 -6
View File
@@ -414,9 +414,10 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
volumeRslt.TestTime = tstRslt.TestTime; /// [s] volumeRslt.TestTime = tstRslt.TestTime; /// [s]
volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef);
volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume ||
&& (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) &&
volumeRslt.TestDone = true; (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty));
volumeRslt.TestDone = true;
} }
if (energyRslt != null && energyRegReader != null) if (energyRslt != null && energyRegReader != null)
@@ -431,9 +432,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart
energyRslt.TestTime = tstRslt.TestTime; /// [s] energyRslt.TestTime = tstRslt.TestTime; /// [s]
energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef);
energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo)
&& (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi);
energyRslt.TestDone = true; energyRslt.TestDone = true;
} }
} }
} }
TestBenchFramework/BenchControl/TestMethods/FlyingStart/HeatMeters/TestParams.cs
+48 -30
View File
@@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{ {
public class TestParams : TestParamsBase, IParamsProvider, ITestParams public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{ {
public float TempWarmLo; /// Low limit for warm temperature [C] public float ErrorLimitLo; /// [%]
public float TempWarmHi; /// High limit for warm temperature [C] public float ErrorLimitHi; /// [%]
public float TempColdLo; /// Low limit for cold temperature [C] public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy
public float TempColdHi; /// High limit for cold temperature [C] public float TempWarmLo; /// Low limit for warm temperature [°C]
public float TempWarmHi; /// High limit for warm temperature [°C]
public float TempColdLo; /// Low limit for cold temperature [°C]
public float TempColdHi; /// High limit for cold temperature [°C]
public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe
public float DeltaTempWarm; public float DeltaTempWarm;
public float DeltaTempCold; public float DeltaTempCold;
@@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
string[] paramNames = new string[] string[] paramNames = new string[]
{ {
Strings.Err_limit_neg_pct_chdr,
Strings.Err_limit_pos_pct_chdr,
Strings.Evaluate_volume,
"T warm lo", "T warm lo",
"T warm hi", "T warm hi",
"T cold lo", "T cold lo",
@@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: return TempWarmLo.ToString(); case 0: return ErrorLimitLo.ToString();
case 1: return TempWarmHi.ToString(); case 1: return ErrorLimitHi.ToString();
case 2: return TempColdLo.ToString(); case 2: return (EvaluateVolume ? Strings.yes : Strings.no);
case 3: return TempColdHi.ToString(); case 3: return TempWarmLo.ToString();
case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); case 4: return TempWarmHi.ToString();
case 5: return DeltaTempWarm.ToString(); case 5: return TempColdLo.ToString();
case 6: return DeltaTempCold.ToString(); case 6: return TempColdHi.ToString();
case 7: return ChangeInTimeWarm.ToString(); case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no);
case 8: return ChangeInTimeCold.ToString(); case 8: return DeltaTempWarm.ToString();
case 9: return Prompt; case 9: return DeltaTempCold.ToString();
case 10: return ChangeInTimeWarm.ToString();
case 11: return ChangeInTimeCold.ToString();
case 12: return Prompt;
default: return string.Empty; default: return string.Empty;
} }
} }
@@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return;
case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return;
case 2: TempColdLo = Utils.ParseSFloat(strValue); return; case 2: EvaluateVolume = strValue.Equals(Strings.yes); return;
case 3: TempColdHi = Utils.ParseSFloat(strValue); return; case 3: TempWarmLo = Utils.ParseSFloat(strValue); return;
case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; case 4: TempWarmHi = Utils.ParseSFloat(strValue); return;
case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; case 5: TempColdLo = Utils.ParseSFloat(strValue); return;
case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; case 6: TempColdHi = Utils.ParseSFloat(strValue); return;
case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return;
case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return;
case 9: Prompt = strValue; return; case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return;
case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return;
case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return;
case 12: Prompt = strValue; return;
default: return; default: return;
} }
} }
@@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
{ {
case 0: case 0:
case 1: case 1:
case 2:
case 3: case 3:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 4: case 4:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 5: case 5:
case 6: case 6:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 2:
case 7: case 7:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 8: case 8:
case 9:
case 10:
case 11:
if (Utils.TryParseUFloat(strValue, out dummy)) return true; if (Utils.TryParseUFloat(strValue, out dummy)) return true;
break; break;
case 9: case 12:
return true; return true;
default: default:
message = "Invalid index"; message = "Invalid index";
@@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStart.HeatMeters
void CopyContentTo(TestParams prms) void CopyContentTo(TestParams prms)
{ {
prms.ErrorLimitLo = ErrorLimitLo;
prms.ErrorLimitHi = ErrorLimitHi;
prms.EvaluateVolume = EvaluateVolume;
prms.TempWarmLo = TempWarmLo; prms.TempWarmLo = TempWarmLo;
prms.TempWarmHi = TempWarmHi; prms.TempWarmHi = TempWarmHi;
prms.TempColdLo = TempColdLo; prms.TempColdLo = TempColdLo;
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+5 -4
View File
@@ -687,8 +687,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
volumeRslt.TestTime = tstRslt.TestTime; /// [s] volumeRslt.TestTime = tstRslt.TestTime; /// [s]
volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef); volumeRslt.Error = Formulas.ErrorFromVolumes(volumeRslt.VolumeMeter, volumeRslt.VolumeRef);
volumeRslt.Passed = (volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) volumeRslt.Passed = !heatMetersTestParams.EvaluateVolume ||
&& (volumeRslt.Error <= test.ErrLimHi - test.Uncertainty); ((volumeRslt.Error >= test.ErrLimLo + test.Uncertainty) &&
(volumeRslt.Error <= test.ErrLimHi - test.Uncertainty));
volumeRslt.TestDone = true; volumeRslt.TestDone = true;
} }
@@ -704,8 +705,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
energyRslt.TestTime = tstRslt.TestTime; /// [s] energyRslt.TestTime = tstRslt.TestTime; /// [s]
energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef); energyRslt.Error = Formulas.ErrorFromVolumes(energyRslt.VolumeMeter, energyRslt.VolumeRef);
energyRslt.Passed = (energyRslt.Error >= test.ErrLimLo + test.Uncertainty) energyRslt.Passed = (energyRslt.Error >= heatMetersTestParams.ErrorLimitLo)
&& (energyRslt.Error <= test.ErrLimHi - test.Uncertainty); && (energyRslt.Error <= heatMetersTestParams.ErrorLimitHi);
energyRslt.TestDone = true; energyRslt.TestDone = true;
} }
} }
TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/HeatMeters/TestParams.cs
+48 -30
View File
@@ -13,10 +13,13 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
{ {
public class TestParams : TestParamsBase, IParamsProvider, ITestParams public class TestParams : TestParamsBase, IParamsProvider, ITestParams
{ {
public float TempWarmLo; /// Low limit for warm temperature [C] public float ErrorLimitLo; /// [%]
public float TempWarmHi; /// High limit for warm temperature [C] public float ErrorLimitHi; /// [%]
public float TempColdLo; /// Low limit for cold temperature [C] public bool EvaluateVolume; /// true = evaluate also the volume, false = evaluate only energy
public float TempColdHi; /// High limit for cold temperature [C] public float TempWarmLo; /// Low limit for warm temperature [°C]
public float TempWarmHi; /// High limit for warm temperature [°C]
public float TempColdLo; /// Low limit for cold temperature [°C]
public float TempColdHi; /// High limit for cold temperature [°C]
public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe public bool FlowMeasuredAtHiTempPipe; /// true = flow measured at high temp. pipe, false = flow measured at low temp. pipe
public float DeltaTempWarm; public float DeltaTempWarm;
public float DeltaTempCold; public float DeltaTempCold;
@@ -32,6 +35,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
string[] paramNames = new string[] string[] paramNames = new string[]
{ {
Strings.Err_limit_neg_pct_chdr,
Strings.Err_limit_pos_pct_chdr,
Strings.Evaluate_volume,
"T warm lo", "T warm lo",
"T warm hi", "T warm hi",
"T cold lo", "T cold lo",
@@ -50,16 +56,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: return TempWarmLo.ToString(); case 0: return ErrorLimitLo.ToString();
case 1: return TempWarmHi.ToString(); case 1: return ErrorLimitHi.ToString();
case 2: return TempColdLo.ToString(); case 2: return (EvaluateVolume ? Strings.yes : Strings.no);
case 3: return TempColdHi.ToString(); case 3: return TempWarmLo.ToString();
case 4: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no); case 4: return TempWarmHi.ToString();
case 5: return DeltaTempWarm.ToString(); case 5: return TempColdLo.ToString();
case 6: return DeltaTempCold.ToString(); case 6: return TempColdHi.ToString();
case 7: return ChangeInTimeWarm.ToString(); case 7: return (FlowMeasuredAtHiTempPipe ? Strings.yes : Strings.no);
case 8: return ChangeInTimeCold.ToString(); case 8: return DeltaTempWarm.ToString();
case 9: return Prompt; case 9: return DeltaTempCold.ToString();
case 10: return ChangeInTimeWarm.ToString();
case 11: return ChangeInTimeCold.ToString();
case 12: return Prompt;
default: return string.Empty; default: return string.Empty;
} }
} }
@@ -68,16 +77,19 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
{ {
switch (i) switch (i)
{ {
case 0: TempWarmLo = Utils.ParseSFloat(strValue); return; case 0: ErrorLimitLo = Utils.ParseSFloat(strValue); return;
case 1: TempWarmHi = Utils.ParseSFloat(strValue); return; case 1: ErrorLimitHi = Utils.ParseSFloat(strValue); return;
case 2: TempColdLo = Utils.ParseSFloat(strValue); return; case 2: EvaluateVolume = strValue.Equals(Strings.yes); return;
case 3: TempColdHi = Utils.ParseSFloat(strValue); return; case 3: TempWarmLo = Utils.ParseSFloat(strValue); return;
case 4: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return; case 4: TempWarmHi = Utils.ParseSFloat(strValue); return;
case 5: DeltaTempWarm = Utils.ParseUFloat(strValue); return; case 5: TempColdLo = Utils.ParseSFloat(strValue); return;
case 6: DeltaTempCold = Utils.ParseUFloat(strValue); return; case 6: TempColdHi = Utils.ParseSFloat(strValue); return;
case 7: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return; case 7: FlowMeasuredAtHiTempPipe = strValue.Equals(Strings.yes); return;
case 8: ChangeInTimeCold = Utils.ParseUFloat(strValue); return; case 8: DeltaTempWarm = Utils.ParseUFloat(strValue); return;
case 9: Prompt = strValue; return; case 9: DeltaTempCold = Utils.ParseUFloat(strValue); return;
case 10: ChangeInTimeWarm = Utils.ParseUFloat(strValue); return;
case 11: ChangeInTimeCold = Utils.ParseUFloat(strValue); return;
case 12: Prompt = strValue; return;
default: return; default: return;
} }
} }
@@ -91,20 +103,23 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
{ {
case 0: case 0:
case 1: case 1:
case 2:
case 3: case 3:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 4: case 4:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 5: case 5:
case 6: case 6:
if (Utils.TryParseSFloat(strValue, out dummy)) return true;
break;
case 2:
case 7: case 7:
if (strValue.Equals(Strings.yes) || strValue.Equals(Strings.no)) return true;
break;
case 8: case 8:
case 9:
case 10:
case 11:
if (Utils.TryParseUFloat(strValue, out dummy)) return true; if (Utils.TryParseUFloat(strValue, out dummy)) return true;
break; break;
case 9: case 12:
return true; return true;
default: default:
message = "Invalid index"; message = "Invalid index";
@@ -117,6 +132,9 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection.HeatMeters
void CopyContentTo(TestParams prms) void CopyContentTo(TestParams prms)
{ {
prms.ErrorLimitLo = ErrorLimitLo;
prms.ErrorLimitHi = ErrorLimitHi;
prms.EvaluateVolume = EvaluateVolume;
prms.TempWarmLo = TempWarmLo; prms.TempWarmLo = TempWarmLo;
prms.TempWarmHi = TempWarmHi; prms.TempWarmHi = TempWarmHi;
prms.TempColdLo = TempColdLo; prms.TempColdLo = TempColdLo;
TestBenchFramework/Resources/Strings.Designer.cs
Generated
+9
View File
@@ -1311,6 +1311,15 @@ namespace TBF.Resources {
} }
} }
/// <summary>
/// Looks up a localized string similar to Evaluate volume.
/// </summary>
internal static string Evaluate_volume {
get {
return ResourceManager.GetString("Evaluate_volume", resourceCulture);
}
}
/// <summary> /// <summary>
/// Looks up a localized string similar to Exit. /// Looks up a localized string similar to Exit.
/// </summary> /// </summary>
TestBenchFramework/Resources/Strings.resx
+3
View File
@@ -1588,4 +1588,7 @@
<data name="PulsesPerKWh" xml:space="preserve"> <data name="PulsesPerKWh" xml:space="preserve">
<value>Pulses per kWh</value> <value>Pulses per kWh</value>
</data> </data>
<data name="Evaluate_volume" xml:space="preserve">
<value>Evaluate volume</value>
</data>
</root> </root>