FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 06:36:04 +00:00
Code Issues Releases Wiki Activity

statistics: bugfix for negative values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7102 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-11-30 18:10:23 +00:00
parent 052768acfe
commit bb44c47a11
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/98_statistics.pm
View File

@ -505,7 +505,7 @@ statistics_doStatisticMinMax ($$$$$$)
# Get reading, cut out first number without units # Get reading, cut out first number without units
my $value = $dev->{READINGS}{$readingName}{VAL}; my $value = $dev->{READINGS}{$readingName}{VAL};
$value =~ s/^[\D]*([\d.]*).*/$1/eg; $value =~ s/^[\D]*(-?[\d.]*).*/$1/eg;
statistics_Log $hash, 4, "Calculating min/avg/max statistics for '".$dev->{NAME}.":$readingName = $value'"; statistics_Log $hash, 4, "Calculating min/avg/max statistics for '".$dev->{NAME}.":$readingName = $value'";
# statistics_doStatisticMinMaxSingle: $hash, $readingName, $value, $saveLast, decPlaces # statistics_doStatisticMinMaxSingle: $hash, $readingName, $value, $saveLast, decPlaces
@ -606,7 +606,7 @@ statistics_doStatisticTendency ($$$$)
# Get reading, cut out first number without units # Get reading, cut out first number without units
my $value = $dev->{READINGS}{$readingName}{VAL}; my $value = $dev->{READINGS}{$readingName}{VAL};
$value =~ s/^[\D]*([\d.]*).*/$1/eg; $value =~ s/^[\D]*(-?[\d.]*).*/$1/eg;
statistics_Log $hash, 4, "Calculating hourly tendency statistics for '".$dev->{NAME}.":$readingName = $value'"; statistics_Log $hash, 4, "Calculating hourly tendency statistics for '".$dev->{NAME}.":$readingName = $value'";
my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "Tendency"; my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "Tendency";
@ -672,7 +672,7 @@ statistics_doStatisticDelta ($$$$)
# Get reading, extract first number without units # Get reading, extract first number without units
my $value = $dev->{READINGS}{$readingName}{VAL}; my $value = $dev->{READINGS}{$readingName}{VAL};
$value =~ s/^[\D]*([\d.]*).*/$1/eg; $value =~ s/^[\D]*(-?[\d.]*).*/$1/eg;
statistics_Log $hash, 4, "Calculating delta statistics for '".$dev->{NAME}.":$readingName = $value'"; statistics_Log $hash, 4, "Calculating delta statistics for '".$dev->{NAME}.":$readingName = $value'";
my $hiddenReadingName = ".".$dev->{NAME}.":".$readingName; my $hiddenReadingName = ".".$dev->{NAME}.":".$readingName;
@ -800,27 +800,32 @@ statistics_doStatisticSpecialPeriod ($$$$$)
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $specialPeriod = AttrVal($name, "specialDeltaPeriodHours", 0); my $specialPeriod = AttrVal($name, "specialDeltaPeriodHours", 0);
return if $specialPeriod == 0; return if $specialPeriod == 0;
my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "SpecialPeriod"; my $statReadingName = $hash->{PREFIX} . ucfirst($readingName) . "SpecialPeriod";
my $hiddenReadingName = ".".$dev->{NAME} . ":" . $readingName . "SpecialPeriod"; my $hiddenReadingName = ".".$dev->{NAME} . ":" . $readingName . "SpecialPeriod";
my $result = $value; # Update hidden stack
my @hidden = ();
if (exists ($hash->{READINGS}{$hiddenReadingName}{VAL}))
{ @hidden = split / /, $hash->{READINGS}{$hiddenReadingName}{VAL}; }
unshift @hidden, $value;
statistics_Log $hash, 4, "Add $value to $hiddenReadingName"; statistics_Log $hash, 4, "Add $value to $hiddenReadingName";
if (exists ($hash->{READINGS}{$hiddenReadingName}{VAL})) { $result .= " " . $hash->{READINGS}{$hiddenReadingName}{VAL}; } while ( $#hidden > $specialPeriod )
my @hidden = split / /, $result; # Internal values {
if ( exists($hidden[$specialPeriod]) ) { my $lastValue = pop @hidden;
statistics_Log $hash, 4, "Remove last value ".$hidden[$specialPeriod]." from '$hiddenReadingName'"; statistics_Log $hash, 4, "Remove last value '$lastValue' from '$hiddenReadingName'";
delete $hidden[$specialPeriod];
} }
$result = 0; # Calculate specialPeriodValue
foreach my $val (@hidden) { $result += $val; } my $result = 0;
foreach (@hidden) { $result += $_; }
$result = sprintf "%.".$decPlaces."f", $result; $result = sprintf "%.".$decPlaces."f", $result;
if ($#hidden + 1 != $specialPeriod) { $result .= " (".($#hidden+1).".hours)"; } if ($#hidden + 1 != $specialPeriod) { $result .= " (".($#hidden+1).".hours)"; }
readingsBulkUpdate($dev, $statReadingName, $result, 1); readingsBulkUpdate($dev, $statReadingName, $result, 1);
# Store hidden stack
$result = join( " ", @hidden ); $result = join( " ", @hidden );
readingsSingleUpdate($hash, $hiddenReadingName, $result, 0); readingsSingleUpdate($hash, $hiddenReadingName, $result, 0);
statistics_Log $hash, 4, "Set '$hiddenReadingName = $result'"; statistics_Log $hash, 4, "Set '$hiddenReadingName = $result'";
@ -836,7 +841,7 @@ statistics_doStatisticDuration ($$$$)
my $devName = $dev->{NAME}; my $devName = $dev->{NAME};
return if not exists ($dev->{READINGS}{$readingName}); return if not exists ($dev->{READINGS}{$readingName});
# Get reading, cut out first number without units # Get reading
my $state = $dev->{READINGS}{$readingName}{VAL}; my $state = $dev->{READINGS}{$readingName}{VAL};
statistics_Log $hash, 4, "Calculating duration statistics for '".$dev->{NAME}.":$readingName = $state'"; statistics_Log $hash, 4, "Calculating duration statistics for '".$dev->{NAME}.":$readingName = $state'";