Merge branch 'develop' into public

This commit fixes #7
citiususc · Jun 5, 2019 · a6d8e80 · a6d8e80
2 parents 73daf4c + 0264679
commit a6d8e80
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -31,18 +31,19 @@ This project is implemented in pure python 3, so no installation is required. Ho
 
 1. [sortedcontainers](https://pypi.python.org/pypi/sortedcontainers)
 2. [numpy](https://pypi.python.org/pypi/numpy)
+3. [python-dateutil](https://pypi.org/project/python-dateutil/)
 
 In addition, the knowledge base for ECG interpretation depends on the following packages:
 
-3. [scipy](https://pypi.python.org/pypi/scipy)
-4. [scikit-learn](https://pypi.python.org/pypi/scikit-learn)
-5. [PyWavelets](https://pypi.python.org/pypi/PyWavelets)
+4. [scipy](https://pypi.python.org/pypi/scipy)
+5. [scikit-learn](https://pypi.python.org/pypi/scikit-learn)
+6. [PyWavelets](https://pypi.python.org/pypi/PyWavelets)
 
 As optional dependencies to support the interactive visualization of the interpretation results and the interpretations tree and to run the demo examples, the following packages are also needed:
 
-6. [matplotlib](https://pypi.python.org/pypi/matplotlib)
-7. [networkx](https://pypi.python.org/pypi/networkx)
-8. [pygraphviz](https://pypi.python.org/pypi/pygraphviz) and [graphviz](https://www.graphviz.org/)
+7. [matplotlib](https://pypi.python.org/pypi/matplotlib)
+8. [networkx](https://pypi.python.org/pypi/networkx)
+9. [pygraphviz](https://pypi.python.org/pypi/pygraphviz) and [graphviz](https://www.graphviz.org/)
 
 Finally, to read ECG signal records it is necessary to have access to a proper installation of the [WFDB software package](http://www.physionet.org/physiotools/wfdb.shtml).
 

diff --git a/construe/inference/reasoning.py b/construe/inference/reasoning.py
@@ -265,7 +265,9 @@ def multicall_succ(interpretation):
     yielded = weakref.WeakSet()
     while True:
         nxt = next((n for n in interpretation.child if n not in yielded), None)
-        nxt = nxt or next(successors)
+        nxt = nxt or next(successors, None)
+        if nxt is None:
+            return
         yielded.add(nxt)
         yield nxt
 

diff --git a/construe/utils/signal_processing/dtw/build/temp.linux-x86_64-3.6/cdtw.o b/construe/utils/signal_processing/dtw/build/temp.linux-x86_64-3.6/cdtw.o
diff --git a/construe/utils/signal_processing/dtw/build/temp.linux-x86_64-3.6/dtw.o b/construe/utils/signal_processing/dtw/build/temp.linux-x86_64-3.6/dtw.o
diff --git a/construe/utils/signal_processing/dtw/dtw.cpython-37m-x86_64-linux-gnu.so b/construe/utils/signal_processing/dtw/dtw.cpython-37m-x86_64-linux-gnu.so
diff --git a/requirements.txt b/requirements.txt
@@ -2,6 +2,7 @@ numpy
 sortedcontainers
 scipy
 scikit-learn
+python-dateutil
 PyWavelets
 matplotlib
 networkx