Browse Source

sinefit: include timestamps on marking output too

tags/nilmtools-1.2.1^0
Jim Paris 8 years ago
parent
commit
4f6bc48619
1 changed files with 7 additions and 2 deletions
  1. +7
    -2
      src/sinefit.py

+ 7
- 2
src/sinefit.py View File

@@ -74,7 +74,7 @@ class SuppressibleWarning(object):

def _write(self, sec, msg):
if sec:
now = "[" + timestamp_to_human(seconds_to_timestamp(sec)) + "] "
now = timestamp_to_human(seconds_to_timestamp(sec)) + ": "
else:
now = ""
sys.stderr.write(now + msg)
@@ -180,7 +180,12 @@ def process(data, interval, args, insert_function, final):

# Return the number of rows we've processed
warn.reset(last_inserted_timestamp)
print "Marked", num_zc, "zero-crossings in", start, "rows"
if last_inserted_timestamp:
now = timestamp_to_human(seconds_to_timestamp(
last_inserted_timestamp)) + ": "
else:
now = ""
printf("%sMarked %d zero-crossings in %d rows\n", now, num_zc, start)
return start

def sfit4(data, fs):


Loading…
Cancel
Save