From f024ea8c455a72c463e645153615102c1afe5af2 Mon Sep 17 00:00:00 2001 From: Karamaz0V1 Date: Fri, 13 Apr 2018 11:27:31 +0200 Subject: [PATCH] Debug Node streaming --- Notebooks/Node Streaming Benchmark.ipynb | 16 +++++++++++++--- ld2dap/RawOutput.py | 21 +++++++++++++++++++++ ld2dap/__init__.py | 1 + ld2dap/core/Stack.py | 8 ++++++-- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 ld2dap/RawOutput.py diff --git a/Notebooks/Node Streaming Benchmark.ipynb b/Notebooks/Node Streaming Benchmark.ipynb index 02aa49e..7baacef 100644 --- a/Notebooks/Node Streaming Benchmark.ipynb +++ b/Notebooks/Node Streaming Benchmark.ipynb @@ -25,9 +25,9 @@ "outputs": [], "source": [ "load = ld2dap.LoadTIFF('../Data/test.tiff')\n", - "trsh = ld2dap.Treshold(1e3)\n", + "trsh = ld2dap.Treshold(1e4)\n", "disp = ld2dap.ShowFig(fname=None)\n", - "out = ld2dap.Output()" + "out = ld2dap.RawOutput()" ] }, { @@ -56,7 +56,17 @@ "metadata": {}, "outputs": [], "source": [ - "out.data, out.metadata" + "out.data.shape" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [ + "for i, m in enumerate(out.metadata):\n", + " print('{}: {}'.format(i, m))" ] }, { diff --git a/ld2dap/RawOutput.py b/ld2dap/RawOutput.py new file mode 100644 index 0000000..b15e7b3 --- /dev/null +++ b/ld2dap/RawOutput.py @@ -0,0 +1,21 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# \file RawOutput.py +# \brief TODO +# \author Florent Guiotte +# \version 0.1 +# \date 13 avril 2018 +# +# TODO details + +from ld2dap.core import Output + +class RawOutput(Output): + def __init__(self): + super().__init__(self.__class__.__name__) + self.data = None + self.metadata = None + + def _process(self, data, metadata): + self.data = data + self.metadata = metadata diff --git a/ld2dap/__init__.py b/ld2dap/__init__.py index 1ca716d..61478d3 100644 --- a/ld2dap/__init__.py +++ b/ld2dap/__init__.py @@ -13,3 +13,4 @@ from .Treshold import Treshold from .LoadTIFF import LoadTIFF from .SaveFig import SaveFig from .ShowFig import ShowFig +from .RawOutput import RawOutput diff --git a/ld2dap/core/Stack.py b/ld2dap/core/Stack.py index 82c8cce..07d1efc 100644 --- a/ld2dap/core/Stack.py +++ b/ld2dap/core/Stack.py @@ -11,8 +11,8 @@ class Stack(object): def __init__(self, begin=0, size=1, desc=None, symb=None) : - self.begin = begin - self.end = begin + size + self.begin = begin + self.end = begin + size self.desc = list() self.symb = list() @@ -23,3 +23,7 @@ class Stack(object): if symb is not None: for i in range(size): self.symb.append(symb.copy() if isinstance(symb, list) else [symb]) + + def __str__(self): + return ("Stack: begin: {}, end: {}, desc: {}, symb: {}".format( + self.begin, self.end, self.desc, self.symb))