Browse Source

Use the new stream_insert_numpy_context function

tags/nilmtools-1.1.0
Jim Paris 11 years ago
parent
commit
3323c997a7
1 changed files with 2 additions and 8 deletions
  1. +2
    -8
      src/filter.py

+ 2
- 8
src/filter.py View File

@@ -279,7 +279,7 @@ class Filter(object):
if args is None:
args = []
extractor = NumpyClient(self.src.url).stream_extract_numpy
inserter = NumpyClient(self.dest.url).stream_insert_context
inserter = NumpyClient(self.dest.url).stream_insert_numpy_context

# Format output data.
formatter = lambda row: " ".join([repr(x) for x in row]) + "\n"
@@ -293,13 +293,7 @@ class Filter(object):
print "Processing", self.interval_string(interval)
with inserter(self.dest.path,
interval.start, interval.end) as insert_ctx:
def insert_function(array):
s = cStringIO.StringIO()
if len(np.shape(array)) != 2:
raise Exception("array must be 2-dimensional")
np.savetxt(s, array)
insert_ctx.insert(s.getvalue())

insert_function = insert_ctx.insert
old_array = np.array([])
for new_array in extractor(self.src.path,
interval.start, interval.end,


Loading…
Cancel
Save