Browse Source

This is broken -- need to either keep overriding __setattr__, or...?

git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@9349 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/bxinterval-last
Jim Paris 13 years ago
parent
commit
b0ed5d7616
3 changed files with 23 additions and 5 deletions
  1. +18
    -0
      nilmdb/fileinterval.py
  2. +3
    -3
      nilmdb/interval.py
  3. +2
    -2
      nilmdb/test_fileinterval.py

+ 18
- 0
nilmdb/fileinterval.py View File

@@ -9,6 +9,24 @@ import bisect
class FileInterval(Interval):
"""Represents an interval of time and its corresponding data"""

def __init__(self, start, end,
filename,
start_offset = None, end_offset = None):
self.start = start
self.end = end
self.filename = filename
if start_offset is None:
start_offset = 0
self.start_offset = start_offset
if end_offset is None:
f = open(filename, 'rb')
f.seek(0, os.SEEK_END)
end_offset = f.tell()
self.end_offset = end_offset

def __setattr__(self, name, value):

def subset(self, start, end):
"""Return a new Interval that is a subset of this one"""
# TODO: Any magic regarding file/offset/length mapping for subsets


+ 3
- 3
nilmdb/interval.py View File

@@ -12,6 +12,9 @@ class IntervalError(Exception):
class Interval(object):
"""Represents an interval of time"""

start = None
end = None

def __init__(self, start, end):
self.start = start
self.end = end
@@ -22,9 +25,6 @@ class Interval(object):
def __str__(self):
return "[" + str(self.start) + " -> " + str(self.end) + "]"

def __getattr__(self, name):
return { }

def __setattr__(self, name, value):
"""Set attribute"""
# TODO: If we need to manipulate file names, offsets, lengths, etc,


+ 2
- 2
nilmdb/test_fileinterval.py View File

@@ -12,10 +12,10 @@ def fiset(string):
if (c == "["):
start = day
elif (c == "|"):
iset += FileInterval(start, day)
iset += FileInterval(start, day, "test.dat")
start = day
elif (c == "]"):
iset += FileInterval(start, day)
iset += FileInterval(start, day, "test.dat")
del start
return iset



Loading…
Cancel
Save