diff --git a/TODO b/TODO index e8e891f..4e3b057 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,4 @@ -- Add count - - Merge adjacent intervals on insert (maybe with client help?) + +- Support general n-floating-point data types + diff --git a/timeit.sh b/timeit.sh index 81b0483..c58dc3c 100755 --- a/timeit.sh +++ b/timeit.sh @@ -1,11 +1,8 @@ ./nilmtool.py create /bpnilm/2/raw RawData -if false; then - time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-110000 /bpnilm/2/raw & - time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-120001 /bpnilm/2/raw & - time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-130002 /bpnilm/2/raw & - time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-140003 /bpnilm/2/raw & - +if true; then + time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-110000 /bpnilm/2/raw + time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s 20110513-120001 /bpnilm/2/raw else for i in $(seq 2000 2050); do time zcat /home/jim/bpnilm-data/snapshot-1-20110513-110002.raw.gz | ./nilmtool.py insert -s ${i}0101-010001 /bpnilm/2/raw