Compare commits
2 Commits
nilmtools-
...
nilmtools-
Author | SHA1 | Date | |
---|---|---|---|
62c8af41ea | |||
4f6bc48619 |
@@ -1,7 +1,6 @@
|
|||||||
#!/usr/bin/python
|
#!/usr/bin/python
|
||||||
|
|
||||||
# Sine wave fitting. This runs about 5x faster than realtime on raw data.
|
# Sine wave fitting.
|
||||||
|
|
||||||
from nilmdb.utils.printf import *
|
from nilmdb.utils.printf import *
|
||||||
import nilmtools.filter
|
import nilmtools.filter
|
||||||
import nilmdb.client
|
import nilmdb.client
|
||||||
@@ -74,7 +73,7 @@ class SuppressibleWarning(object):
|
|||||||
|
|
||||||
def _write(self, sec, msg):
|
def _write(self, sec, msg):
|
||||||
if sec:
|
if sec:
|
||||||
now = "[" + timestamp_to_human(seconds_to_timestamp(sec)) + "] "
|
now = timestamp_to_human(seconds_to_timestamp(sec)) + ": "
|
||||||
else:
|
else:
|
||||||
now = ""
|
now = ""
|
||||||
sys.stderr.write(now + msg)
|
sys.stderr.write(now + msg)
|
||||||
@@ -180,7 +179,12 @@ def process(data, interval, args, insert_function, final):
|
|||||||
|
|
||||||
# Return the number of rows we've processed
|
# Return the number of rows we've processed
|
||||||
warn.reset(last_inserted_timestamp)
|
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
|
return start
|
||||||
|
|
||||||
def sfit4(data, fs):
|
def sfit4(data, fs):
|
||||||
|
Reference in New Issue
Block a user