Commit Graph

513 Commits

Author SHA1 Message Date
22c8b08523 Misc
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9297 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-24 22:48:09 +00:00
0e800f24e8 Remove src dir
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9296 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-24 21:01:03 +00:00
2c8b80b2ca Remove Interval.merge() because we likely can't merge interval
metadata in the future.

Add Interval.subset() which we SHOULD be able to do (just keep track
of an offset/length as a subset of the original interval data)

Since we don't have merge, remove IntervalSet._optimized_copy()

Since we don't have _optimized_copy, add Interval.adjacent() and fix
__eq__ to use that instead.



git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9283 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-18 20:53:41 +00:00
c011907e96 Update comments
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9281 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-17 23:25:12 +00:00
b22ebb6fa4 Need to fill out __and__ and __or__... tricky
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9280 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-17 23:08:05 +00:00
9bf291ceb8 More Interval and IntervalSet work.
Now we can compare two interval sets where one has two adjacent
intervals, and one covers them both, and they correctly "match".


git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9278 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-17 21:41:47 +00:00
a84b9850d0 More work on interval sets this time
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9273 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-17 00:06:12 +00:00
c033d69836 Cleanup
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9272 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-16 22:46:12 +00:00
9bc109ac85 Update
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9270 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-16 22:40:59 +00:00
c50151c000 misc
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9269 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-16 22:38:58 +00:00
e2f89982cb Update tests etc
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9268 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-16 22:30:26 +00:00
5844afed0b Basic framework for a proper python package
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9267 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-02-16 20:01:16 +00:00
0de8c81943 misc updates
git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9086 ddd99763-3ecb-0310-9145-efcb8ce7c51f
2011-01-17 19:51:35 +00:00