diff --git a/TBF/BenchControl/Sequences/SequenceBase.cs b/TBF/BenchControl/Sequences/SequenceBase.cs index 2de1990b5..b633c9bb7 100644 --- a/TBF/BenchControl/Sequences/SequenceBase.cs +++ b/TBF/BenchControl/Sequences/SequenceBase.cs @@ -1097,15 +1097,16 @@ namespace TBF.BenchControl.Sequences /// /// Test to be simulated /// Test result - protected void MakeSimulated(string testName, int repeats, int repetitionNr, int part, float errorPctBase) + protected void MakeSimulated(Config.Entities.Test test, int repetitionNr, int part, float errorPctBase) { - string fullTestName = Results.Utils.GetTestName(testName, repeats, repetitionNr); + string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); if (tstRslt == null) return; /// Prevent program crash in certain cases - tstRslt.StartTime = DateTime.Now; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = DateTime.Now; tstRslt.EndTime = DateTime.Now + new TimeSpan(0,0,1); tstRslt.FlowSetTime = 10; tstRslt.TestTime = tstRslt.TargetTime(); @@ -1207,13 +1208,14 @@ namespace TBF.BenchControl.Sequences /// /// Test to be simulated /// Test result - protected void MakeSimulatedCompound(string testName, int repeats, int repetitionNr, int part, float errorPct, float mainPart) + protected void MakeSimulatedCompound(Config.Entities.Test test, int repetitionNr, int part, float errorPct, float mainPart) { - string fullTestName = Results.Utils.GetTestName(testName, repeats, repetitionNr); + string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); - tstRslt.StartTime = DateTime.Now; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = DateTime.Now; tstRslt.EndTime = DateTime.Now + new TimeSpan(0, 0, 1); tstRslt.FlowSetTime = 10; tstRslt.TestTime = tstRslt.TargetTime(); @@ -1334,12 +1336,13 @@ namespace TBF.BenchControl.Sequences /// /// Test to be simulated /// Test result - protected void MakeSimulatedHeatMeters(string testName, int repeats, int repetitionNr, int part, float errorPct, double energy, float energyErrLimLo, float energyErrLimHi, bool evaluateVolume) + protected void MakeSimulatedHeatMeters(Config.Entities.Test test, int repetitionNr, int part, float errorPct, double energy, float energyErrLimLo, float energyErrLimHi, bool evaluateVolume) { - string fullTestName = Results.Utils.GetTestName(testName, repeats, repetitionNr); + string fullTestName = Results.Utils.GetTestName(test.Name, test.Repeats, repetitionNr); Results.Entities.TestRslt tstRslt = ProcessData.BatchRslts.GetTestRslt(fullTestName, part); + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; tstRslt.StartTime = DateTime.Now; tstRslt.EndTime = DateTime.Now + new TimeSpan(0, 0, 1); tstRslt.FlowSetTime = 10; diff --git a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs index aebbacfc1..2a574e875 100644 --- a/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs +++ b/TBF/BenchControl/TestMethods/Adjustment/AdjustmentSeq.cs @@ -369,7 +369,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -404,7 +405,8 @@ namespace TBF.BenchControl.TestMethods.Adjustment if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); meterRslt.VolumeStart = 0; /// liter diff --git a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs index 83331633f..fb629494a 100644 --- a/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs +++ b/TBF/BenchControl/TestMethods/CombinedWithDetection/CombinedWithDetectionSeq.cs @@ -45,11 +45,11 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (test.Name.ToLower().Contains("rise") || test.Name.ToLower().Contains("steig")) { - MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.0f); + MakeSimulatedCompound(test, 1, 0, 0.7f, 0.0f); } else { - MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.9f); + MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); @@ -603,7 +603,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -615,7 +616,7 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * cBrd.EtPulses(0) / tstRslt.TestTime; /// [m3/h] tstRslt.Buoyancy = Formulas.Buoyancy(); - double density = Formulas.WaterDensityFromTemp((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2.0); + double density = Formulas.WaterDensityFromTemp((tstRslt.TempUpMean + tstRslt.TempDownMean) / 2.0); tstRslt.VolumeCTV = 1000.0 * tstRslt.Buoyancy * (tstRslt.MassEnd - tstRslt.MassStart) / density; /// [l] 1000.0f is because density is in [kg/m3] tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter @@ -646,7 +647,8 @@ namespace TBF.BenchControl.TestMethods.CombinedWithDetection if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; /// Optionally supress pulses from the large water meter meterRslt.PulsesMeter = (isAux == 0 && testParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses); diff --git a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs index c10773184..510505a7f 100644 --- a/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs +++ b/TBF/BenchControl/TestMethods/Endurance/EnduranceSeq.cs @@ -348,22 +348,23 @@ namespace TBF.BenchControl.TestMethods.Endurance UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; - tstRslt.EndTime = TestEndTime; - tstRslt.FlowSetTime = flowSetTime; - tstRslt.TestTime = cBrd.TTime; /// [s] measurement time + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; + tstRslt.EndTime = TestEndTime; + tstRslt.FlowSetTime = flowSetTime; + tstRslt.TestTime = cBrd.TTime; /// [s] measurement time tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) tstRslt.MassStartRaw = 0; - tstRslt.MassStart = 0; - tstRslt.MassEndRaw = 0; - tstRslt.MassEnd = 0; - tstRslt.FlowMass = 0; /// [kg/h] - tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.Buoyancy = Formulas.Buoyancy(); + tstRslt.MassStart = 0; + tstRslt.MassEndRaw = 0; + tstRslt.MassEnd = 0; + tstRslt.FlowMass = 0; /// [kg/h] + tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] + tstRslt.Buoyancy = Formulas.Buoyancy(); tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.ConstMaster = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter - tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3] - tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement + tstRslt.ConstMaster = outPath.FlowMeter.LtrPerPulseCorrected(tstRslt.FlowVolume, rangeIx); /// Corrected master pulses per liter + tstRslt.VolumeCTV = tstRslt.ConstMaster * tstRslt.PulsesMaster; /// [l] 1000.0f is because density is in [kg/m3] + tstRslt.ErrorMaster = 0.0; /// Cannot be determined without a mass measurement tstRslt.FlowMean = (float)RefFlowStat.Average; tstRslt.FlowStart = (float)RefFlowStat.First; @@ -389,6 +390,7 @@ namespace TBF.BenchControl.TestMethods.Endurance if (meterRslt != null && regReader != null) { + meterRslt.RegReaderClass = regReader.ClassName; meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); diff --git a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs index f02563c6d..c2088bbd2 100644 --- a/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartAdvanced/FixedStartAdvancedSeq.cs @@ -501,22 +501,23 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; - tstRslt.EndTime = TestEndTime; - tstRslt.FlowSetTime = flowSetTime; - tstRslt.TestTime = cBrd.TTime; /// [s] measurement time + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; + tstRslt.EndTime = TestEndTime; + tstRslt.FlowSetTime = flowSetTime; + tstRslt.TestTime = cBrd.TTime; /// [s] measurement time tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) tstRslt.MassStartRaw = StartMass.Val; - tstRslt.MassStart = massStart; /// [kg] calculated before displaying 'End state' dialog - tstRslt.MassEndRaw = EndMass.Val; - tstRslt.MassEnd = massEnd; /// [kg] calculated before displaying 'End state' dialog - tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] - tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; - tstRslt.Buoyancy = buoyancy; - tstRslt.VolumeCTV = volumeCTV; /// [kg] calculated before displaying 'End state' dialog + tstRslt.MassStart = massStart; /// [kg] calculated before displaying 'End state' dialog + tstRslt.MassEndRaw = EndMass.Val; + tstRslt.MassEnd = massEnd; /// [kg] calculated before displaying 'End state' dialog + tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] + tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; + tstRslt.Buoyancy = buoyancy; + tstRslt.VolumeCTV = volumeCTV; /// [kg] calculated before displaying 'End state' dialog tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter - tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); + tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter + tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; tstRslt.FlowStart = (float)RefFlowStat.First; @@ -538,7 +539,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartAdvanced if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = 1.0f; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = 1.0f; meterRslt.VolumeStart = regReader.BeginWMState; meterRslt.VolumeEnd = regReader.EndWMState; meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; diff --git a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs index 52d966d82..66f3b60b2 100644 --- a/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartDeferredEvaluation/FixedStartDeferredEvaluationSeq.cs @@ -897,24 +897,25 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; - tstRslt.EndTime = TestEndTime; - tstRslt.FlowSetTime = flowSetTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; + tstRslt.EndTime = TestEndTime; + tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = Math.Max(1.0, EndTime - StartTime); /// [s] measurement time, at least 1 to prevent division by zero tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) tstRslt.MassStartRaw = StartMass.Val; - tstRslt.MassStart = massStart; - tstRslt.MassEndRaw = EndMass.Val; - tstRslt.MassEnd = massEnd; - tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] - tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = buoyancy; - tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] - tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter - tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); + tstRslt.MassStart = massStart; + tstRslt.MassEndRaw = EndMass.Val; + tstRslt.MassEnd = massEnd; + tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] + tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] + tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter + tstRslt.Buoyancy = buoyancy; + tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] + tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter + tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; tstRslt.FlowStart = (float)RefFlowStat.First; @@ -1049,7 +1050,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.VolumeStart = regReader.BeginWMState; /// [l] From forms/images meterRslt.VolumeEnd = regReader.EndWMState; /// [l] From forms/images meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; /// [l] @@ -1093,7 +1095,8 @@ namespace TBF.BenchControl.TestMethods.FixedStartDeferredEvaluation if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.VolumeStart = regReader.BeginWMState; /// From forms/images meterRslt.VolumeEnd = regReader.EndWMState; /// From forms/images meterRslt.VolumeMeter = meterRslt.VolumeEnd - meterRslt.VolumeStart; diff --git a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs index 31032f827..1520e5ea8 100644 --- a/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FixedStartMassCollection/FixedStartMassCollectionSeq.cs @@ -935,24 +935,25 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; - tstRslt.EndTime = TestEndTime; - tstRslt.FlowSetTime = flowSetTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; + tstRslt.EndTime = TestEndTime; + tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = Math.Max(1.0, EndTime - StartTime); /// [s] measurement time, at least 1 to prevent division by zero tstRslt.PulsesMaster = Convert.ToDouble(cBrd.EtPulses(0)); /// Pulses of the master flow meter (test total) tstRslt.MassStartRaw = StartMass.Val; - tstRslt.MassStart = massStart; - tstRslt.MassEndRaw = EndMass.Val; - tstRslt.MassEnd = massEnd; - tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] - tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] - tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter - tstRslt.Buoyancy = buoyancy; - tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] - tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter - tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); + tstRslt.MassStart = massStart; + tstRslt.MassEndRaw = EndMass.Val; + tstRslt.MassEnd = massEnd; + tstRslt.FlowMass = 3600.0 * (tstRslt.MassEnd - tstRslt.MassStart) / tstRslt.TestTime; /// [kg/h] + tstRslt.FlowVolume = 3.6 * LtrPerRefPulse * tstRslt.PulsesMaster / tstRslt.TestTime; /// [m3/h] + tstRslt.VolumeMaster = LtrPerRefPulse * tstRslt.PulsesMaster; /// [l] volume from the master flow meter + tstRslt.Buoyancy = buoyancy; + tstRslt.VolumeCTV = volumeCTV; /// [l] 1000.0f is because density is in [kg/m3] + tstRslt.ConstMaster = LtrPerRefPulse * tstRslt.VolumeCTV / tstRslt.VolumeMaster; /// Corrected master pulses per liter + tstRslt.ErrorMaster = Formulas.ErrorFromVolumes(tstRslt.VolumeMaster, tstRslt.VolumeCTV); tstRslt.FlowMean = (float)RefFlowStat.Average; tstRslt.FlowStart = (float)RefFlowStat.First; @@ -984,6 +985,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (meterRslt != null && regReader != null) { + meterRslt.RegReaderClass = regReader.ClassName; meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.VolumeStart = regReader.BeginWMState; /// [l] meterRslt.VolumeEnd = regReader.EndWMState; /// [l] @@ -1098,6 +1100,7 @@ namespace TBF.BenchControl.TestMethods.FixedStartMassCollection if (meterRslt != null && regReader != null) { + meterRslt.RegReaderClass = regReader.ClassName; meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.VolumeStart = regReader.BeginWMState; meterRslt.VolumeEnd = regReader.EndWMState; diff --git a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs index 4b041196c..43b165039 100644 --- a/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStart/FlyingStartSeq.cs @@ -44,17 +44,17 @@ namespace TBF.BenchControl.TestMethods.FlyingStart if (compoundTestParams != null) { - if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 4.7f, 0.9f); - else MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 1.0f); + if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f); + else MakeSimulatedCompound(test, 1, 0, 0.7f, 1.0f); } else if (heatMetersTestParams != null) { - MakeSimulatedHeatMeters(test.Name, 1, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); + MakeSimulatedHeatMeters(test, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); } - else if (test.Name.ToLower().Contains("q3")) MakeSimulated(test.Name, 1, 1, 0, -0.5f); - else if (test.Name.ToLower().Contains("q2")) MakeSimulated(test.Name, 1, 1, 0, 0.5f); - else if (test.Name.ToLower().Contains("q1")) MakeSimulated(test.Name, 1, 1, 0, -5.1f); - else MakeSimulated(test.Name, 1, 1, 0, 0.9f); + else if (test.Name.ToLower().Contains("q3")) MakeSimulated(test, 1, 0, -0.5f); + else if (test.Name.ToLower().Contains("q2")) MakeSimulated(test, 1, 0, 0.5f); + else if (test.Name.ToLower().Contains("q1")) MakeSimulated(test, 1, 0, -5.1f); + else MakeSimulated(test, 1, 0, 0.9f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); @@ -514,7 +514,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -636,7 +637,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStart if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); diff --git a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs index 8b52ea7da..65aad451e 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartFirstRepetWithMassColl/FlyingStartFirstRepetWithMassCollSeq.cs @@ -55,12 +55,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl if (compoundTestParams != null) { - if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 4.7f, 0.9f); - else MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 1.0f); + if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f); + else MakeSimulatedCompound(test, 1, 0, 0.7f, 1.0f); } else if (heatMetersTestParams != null) { - MakeSimulatedHeatMeters(test.Name, 1, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); + MakeSimulatedHeatMeters(test, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); } else { @@ -69,7 +69,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl else if (test.Name.ToLower().Contains("q2")) errorPctBase = 0.5f; else if (test.Name.ToLower().Contains("q1")) errorPctBase = -5.1f; - MakeSimulated(test.Name, test.Repeats, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); + MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); @@ -786,7 +786,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -875,7 +876,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; /// Optionally supress pulses from the large water meter meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses); @@ -1001,7 +1003,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartFirstRepetWithMassColl if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs index 169c7cf9f..2c6d547d9 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs @@ -55,12 +55,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged if (compoundTestParams != null) { - if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 4.7f, 0.9f); - else MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 1.0f); + if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f); + else MakeSimulatedCompound(test, 1, 0, 0.7f, 1.0f); } else if (heatMetersTestParams != null) { - MakeSimulatedHeatMeters(test.Name, 1, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); + MakeSimulatedHeatMeters(test, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); } else { @@ -69,7 +69,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged else if (test.Name.ToLower().Contains("q2")) errorPctBase = 0.5f; else if (test.Name.ToLower().Contains("q1")) errorPctBase = -5.1f; - MakeSimulated(test.Name, test.Repeats, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); + MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); @@ -785,7 +785,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged double massPulses = Convert.ToDouble(cBrd.EtPulsesK); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -844,7 +845,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; /// Optionally supress pulses from the large water meter meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses); @@ -971,7 +973,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollProlonged if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); diff --git a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs index dd6889f4f..637ba1960 100644 --- a/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs +++ b/TBF/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs @@ -51,12 +51,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (compoundTestParams != null) { - if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 4.7f, 0.9f); - else MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 1.0f); + if (test.Name.ToLower().Contains("nok")) MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f); + else MakeSimulatedCompound(test, 1, 0, 0.7f, 1.0f); } else if (heatMetersTestParams != null) { - MakeSimulatedHeatMeters(test.Name, 1, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); + MakeSimulatedHeatMeters(test, 1, 0, 1.5f, 1000000, heatMetersTestParams.ErrorLimitLo, heatMetersTestParams.ErrorLimitHi, heatMetersTestParams.EvaluateVolume); } else { @@ -65,7 +65,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection else if (test.Name.ToLower().Contains("q2")) errorPctBase = 0.5f; else if (test.Name.ToLower().Contains("q1")) errorPctBase = -5.1f; - MakeSimulated(test.Name, test.Repeats, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); + MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); @@ -152,7 +152,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection else if (test.Name.ToLower().Contains("q2")) errorPctBase = 0.5f; else if (test.Name.ToLower().Contains("q1")) errorPctBase = -5.1f; - MakeSimulated(test.Name, test.Repeats, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); + MakeSimulated(test, repetitionNr, 0, errorPctBase + repetitionNr * 0.1f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); @@ -833,7 +833,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -891,7 +892,8 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; /// Optionally supress pulses from the large water meter meterRslt.PulsesMeter = (isAux == 0 && compoundTestParams.SupressTrills) ? 0 : Convert.ToDouble(regReader.WMPulses); @@ -1018,6 +1020,7 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection if (meterRslt != null && regReader != null) { + meterRslt.RegReaderClass = regReader.ClassName; meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.PulsesMeter = Convert.ToDouble(regReader.WMPulses); meterRslt.PulsesMaster = Convert.ToDouble(regReader.WMRefPulses); diff --git a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs index b9d55c0d1..6f8257124 100644 --- a/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs +++ b/TBF/BenchControl/TestMethods/LeakTest/LeakTestSeq.cs @@ -277,7 +277,8 @@ namespace TBF.BenchControl.TestMethods.LeakTest tstRslt.DensityDiv = 0; /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = 0; tstRslt.TestTime = Convert.ToDouble(testParams.DurationPMax); /// [s] measurement time diff --git a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs index 1450a45e6..ddf8b90aa 100644 --- a/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs +++ b/TBF/BenchControl/TestMethods/PMaxTest/PMaxTestSeq.cs @@ -188,7 +188,8 @@ namespace TBF.BenchControl.TestMethods.PMaxTest tstRslt.DensityDiv = 0; /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = 0; tstRslt.TestTime = Convert.ToDouble(testParams.DurationPMax); /// [s] measurement time diff --git a/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs b/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs index 32900a641..b09795614 100644 --- a/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs +++ b/TBF/BenchControl/TestMethods/ReferenceFlowmeterCalibration/ReferenceFlowmeterCalibrationSeq.cs @@ -308,7 +308,8 @@ namespace TBF.BenchControl.TestMethods.ReferenceFlowmeterCalibration UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time diff --git a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs index 2619c5d55..9ad7ee884 100644 --- a/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs +++ b/TBF/BenchControl/TestMethods/SensitivityTest/SensitivityTestSeq.cs @@ -18,6 +18,14 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest const int DetectionBufferSize = 9; const int DetectionKernelSize = 5; + /// + /// Executes the specified test. + /// + /// The test. + /// The repetition nr. + /// The test parameters. + /// The debug level. + /// public IList Execute(Config.Entities.Test test, int repetitionNr, SensitivityTestParams testParams, Config.Entities.DebugMode debugLevel) @@ -45,11 +53,11 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest if (test.Name.ToLower().Contains("rise") || test.Name.ToLower().Contains("steig")) { - MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.0f); + MakeSimulatedCompound(test, 1, 0, 0.7f, 0.0f); } else { - MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.9f); + MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); } Bridge.OnTestProgress(this, new TestProgressEventArgs(test, repetitionNr, Config.Entities.Progress.Completed)); @@ -432,7 +440,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest UpdateTempPressDensAmb(tstRslt); /// Main results - tstRslt.StartTime = TestStartTime; + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = TestStartTime; tstRslt.EndTime = TestEndTime; tstRslt.FlowSetTime = flowSetTime1 - flowSetTime0; tstRslt.TestTime = cBrd.TTime; /// [s] measurement time @@ -468,7 +477,8 @@ namespace TBF.BenchControl.TestMethods.SensitivityTest if (meterRslt != null && regReader != null) { - meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; + meterRslt.RegReaderClass = regReader.ClassName; + meterRslt.PulsesPerLiter = regReader.PulsesPerLtr; meterRslt.Passed = (Qrise <= test.Qto) && (tstRslt.ErrorFlags == 0 || tstRslt.ErrorFlagsMode() != Config.Entities.ErrorFlagsMode.On); meterRslt.TestDone = true; diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs index 88e9ab044..20eca57ea 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationForm.cs @@ -1828,10 +1828,11 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication /// Auxiliary results ... not required /// Main results - tstRslt.StartTime = tstRslt.Batch.StartTime; - tstRslt.EndTime = endTime; - tstRslt.FlowSetTime = 0; - tstRslt.Buoyancy = Formulas.Buoyancy(); + tstRslt.MethodClass = TbfComponents.FindComponent(test.Method).ClassName; + tstRslt.StartTime = tstRslt.Batch.StartTime; + tstRslt.EndTime = endTime; + tstRslt.FlowSetTime = 0; + tstRslt.Buoyancy = Formulas.Buoyancy(); tstRslt.TestTime += testTime; /// [s] total communication time of all tests for (int i = 0; i < iperlHeads.Count; i++) diff --git a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs index 67a8e6317..be555fb08 100644 --- a/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs +++ b/TBF/BenchControl/TestMethods/iPerlCommunication/iPerlCommunicationSeq.cs @@ -110,13 +110,13 @@ namespace TBF.BenchControl.TestMethods.iPerlCommunication Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.JustStarted)); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.FlowSetting)); - if (testParams.Activity.ToLower().Contains("q3")) MakeSimulated(test.Name, 1, 1, 0, -0.5f); - else if (testParams.Activity.ToLower().Contains("q2")) MakeSimulated(test.Name, 1, 1, 0, 0.5f); - else if (testParams.Activity.ToLower().Contains("q1")) MakeSimulated(test.Name, 1, 1, 0, -5.1f); - else if (testParams.Activity.ToLower().Contains("compound ok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 1.0f); - else if (testParams.Activity.ToLower().Contains("compound nok")) MakeSimulatedCompound(test.Name, 1, 1, 0, 4.7f, 0.9f); - else if (testParams.Activity.ToLower().Contains("compound rise")) MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.0f); - else if (testParams.Activity.ToLower().Contains("compound fall")) MakeSimulatedCompound(test.Name, 1, 1, 0, 0.7f, 0.9f); + if (testParams.Activity.ToLower().Contains("q3")) MakeSimulated(test, 1, 0, -0.5f); + else if (testParams.Activity.ToLower().Contains("q2")) MakeSimulated(test, 1, 0, 0.5f); + else if (testParams.Activity.ToLower().Contains("q1")) MakeSimulated(test, 1, 0, -5.1f); + else if (testParams.Activity.ToLower().Contains("compound ok")) MakeSimulatedCompound(test, 1, 0, 0.7f, 1.0f); + else if (testParams.Activity.ToLower().Contains("compound nok")) MakeSimulatedCompound(test, 1, 0, 4.7f, 0.9f); + else if (testParams.Activity.ToLower().Contains("compound rise")) MakeSimulatedCompound(test, 1, 0, 0.7f, 0.0f); + else if (testParams.Activity.ToLower().Contains("compound fall")) MakeSimulatedCompound(test, 1, 0, 0.7f, 0.9f); Bridge.OnTestProgress(this, new TestProgressEventArgs(test, Config.Entities.Progress.Completed)); Bridge.OnTestCompleted(this, new TestCompletedEventArgs(test.Name, ProcessData.BatchRslts.GetTestRslt(Results.Utils.GetTestName(test.Name, 1, 1), 0))); diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index 9cbaa3475..06134cff3 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.823.0")] -[assembly: AssemblyFileVersion("2.18.823.0")] +[assembly: AssemblyVersion("2.18.824.0")] +[assembly: AssemblyFileVersion("2.18.824.0")]