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

Masses are stored in double variables everywhere.

Browse Source
This commit is contained in:
Milan Hanajik
2016-10-07 14:06:54 +02:00
parent 9f2e8407a0
commit 4160420844
26 changed files with 104 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TestBenchFramework/BenchControl/MettlerToledo/Multi/ReadStableMassOp.cs
+11 -12
View File
@@ -1,6 +1,5 @@
///
/// Copyright (c) 2015 Sensus Metering Systems
/// Author: Milan Hanajik
/// Copyright (c) 2015-2016 Sensus Metering Systems
///
using System;
using log4net;
@@ -17,15 +16,15 @@ namespace TBF.BenchControl.MettlerToledo.Multi
public override string ToString() { return string.Format("ReadStableMassOp(.,{0},.)", totalReadingsCount); }
/// Operation specific
float[] massReadings;
double[] massReadings;
int currentReadingsCount;
/// Set by the constructor
BalanceDev balanceDev;
int totalReadingsCount;
float maxSpread; /// Maximum spread of measurements in kg (otherwise the measurement continues)
double maxSpread; /// Maximum spread of measurements in kg (otherwise the measurement continues)
bool method; /// false = slow (precise), true = fast (immediate)
FloatBox result;
DoubleBox result;
bool started;
@@ -37,7 +36,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
/// <param name="readingsCount">Required mass readings count (>= 3)</param>
/// <param name="maxSpread">Maximum spread of measurements in kg (otherwise the measurement continues)</param>
/// <param name="method">Method: false = slow (precise), true = fast (immediate)</param>
public ReadStableMassOp(BalanceDev balanceDev, ref FloatBox result, int readingsCount, float maxSpread, bool method)
public ReadStableMassOp(BalanceDev balanceDev, ref DoubleBox result, int readingsCount, double maxSpread, bool method)
{
if (balanceDev == null) throw new ArgumentNullException("balanceDev");
this.balanceDev = balanceDev;
@@ -67,7 +66,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
{
started = false;
currentReadingsCount = 0;
massReadings = new float[totalReadingsCount];
massReadings = new double[totalReadingsCount];
started = BalanceDev.GetImmediateMassMeasurement(balanceDev.IdNr, balanceDev.Name);
}
@@ -92,7 +91,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
#if true /// OLD_WAY_OF_MASS_CALCULATION
/// Exclude min. and max. value, calculate average
Array.Sort(massReadings);
float calcMass = 0;
double calcMass = 0;
for (int i = 1; i < totalReadingsCount - 1; i++)
{
calcMass += massReadings[i];
@@ -102,9 +101,9 @@ namespace TBF.BenchControl.MettlerToledo.Multi
result.Val = calcMass;
return Event.BalanceDone; /// Mass has just been calculated
#else
float minimum = float.MaxValue;
float maximum = float.MinValue;
foreach (float val in massReadings)
double minimum = double.MaxValue;
double maximum = double.MinValue;
foreach (double val in massReadings)
{
if (val < minimum) minimum = val;
if (val > maximum) maximum = val;
@@ -112,7 +111,7 @@ namespace TBF.BenchControl.MettlerToledo.Multi
if ((maximum - minimum) <= maxSpread)
{
float calcMass = 0;
double calcMass = 0;
for (int i = 0; i < totalReadingsCount; i++)
{
calcMass += massReadings[i];