Cosmetical changes and minor improvements

This commit is contained in:
Milan Hanajik
2018-01-24 13:55:16 +01:00
parent 4144a8970b
commit 095d4aab2b
16 changed files with 175 additions and 115 deletions
@@ -28,7 +28,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Compound
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
Strings.SupressWMTrills,
};
public override string ParamName(int i) { return paramNames[i]; }
@@ -808,11 +808,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
tstRslt.FlowMin = (float)RefFlowStat.Min;
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.DiverterStart = Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DiverterStart = switchTimeStart; /// Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DivStart10 = switchTimeStartLo.Val;
tstRslt.DivStart50 = switchTimeStart;
tstRslt.DivStart90 = switchTimeStartHi.Val;
tstRslt.DiverterEnd = Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DiverterEnd = switchTimeEnd; /// Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DivEnd90 = switchTimeEndHi.Val;
tstRslt.DivEnd50 = switchTimeEnd;
tstRslt.DivEnd10 = switchTimeEndLo.Val;
@@ -1020,32 +1020,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged
}
meterRslt.Error = Formulas.ErrorFromVolumes(meterRslt.VolumeMeter, meterRslt.VolumeRef);
#if TEST_MODE
if (!BatchRslts.IsProduction() &&
((test.Name.ToLower().Contains("q2") && Math.Abs(meterRslt.Error) > 2.0 && Math.Abs(meterRslt.Error) <= 4.0) ||
(test.Name.ToLower().Contains("q1") && Math.Abs(meterRslt.Error) > 5.0 && Math.Abs(meterRslt.Error) <= 10.0)))
{
meterRslt.KorrErrQ = meterRslt.Error;
meterRslt.Error /= 2.0;
meterRslt.VolumeMeter = (1.0 + meterRslt.Error / 100.0) * meterRslt.VolumeRef;
meterRslt.PulsesMeter = meterRslt.VolumeMeter * regReader.PulsesPerLtr;
if (meterRslt.VolumeEnd > meterRslt.VolumeStart)
{
meterRslt.VolumeEnd = meterRslt.VolumeStart + meterRslt.VolumeMeter;
}
else if (meterRslt.VolumeEnd < meterRslt.VolumeStart)
{
meterRslt.VolumeEnd = meterRslt.VolumeStart - meterRslt.VolumeMeter;
}
}
else
{
meterRslt.KorrErrQ = 0;
}
#endif
meterRslt.Passed = (meterRslt.Error >= test.GetErrLimLo(tstRslt.FlowMean) + test.Uncertainty)
&& (meterRslt.Error <= test.GetErrLimHi(tstRslt.FlowMean) - test.Uncertainty)
&& (tstRslt.ErrorFlags == 0 || tstRslt.ErrorFlagsMode() != Config.Entities.ErrorFlagsMode.On);
@@ -40,7 +40,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.HeatMeters
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
Strings.Err_limit_neg_pct_chdr,
Strings.Err_limit_pos_pct_chdr,
Strings.Evaluate_volume,
@@ -3,7 +3,6 @@
///
using System.Collections.Generic;
using TBF.BenchControl.Generic;
using TBF.BenchControl.Configs.NameOnly;
namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
{
@@ -26,7 +26,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged.Single
string[] paramNames = new string[]
{
Strings.Volume_to_tank,
string.Format("{0} [l]", Strings.Volume_to_tank),
};
public override string ParamName(int i) { return paramNames[i]; }
public override int ParamsCount() { return paramNames.Length; }
@@ -1,5 +1,5 @@
///
/// Copyright (c) 2013-2017 Sensus Metering Systems
/// Copyright (c) 2013-2018 Sensus Slovensko a.s.
///
using System;
using System.Collections.Generic;
@@ -792,11 +792,11 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
tstRslt.FlowMin = (float)RefFlowStat.Min;
tstRslt.FlowMax = (float)RefFlowStat.Max;
tstRslt.DiverterStart = Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DiverterStart = switchTimeStart; /// Math.Abs(switchTimeStartHi.Val - switchTimeStartLo.Val);
tstRslt.DivStart10 = switchTimeStartLo.Val;
tstRslt.DivStart50 = switchTimeStart;
tstRslt.DivStart90 = switchTimeStartHi.Val;
tstRslt.DiverterEnd = Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DiverterEnd = switchTimeEnd; /// Math.Abs(switchTimeEndLo.Val - switchTimeEndHi.Val);
tstRslt.DivEnd90 = switchTimeEndHi.Val;
tstRslt.DivEnd50 = switchTimeEnd;
tstRslt.DivEnd10 = switchTimeEndLo.Val;