Add support for Python algorithm plugins

1 files changed, 5 insertions, 67 deletions

diff --git a/python/astra/utils.pyx b/python/astra/utils.pyx
index ddb37aa..3746b8e 100644
--- a/python/astra/utils.pyx
+++ b/python/astra/utils.pyx
@@ -30,7 +30,6 @@ cimport numpy as np
 import numpy as np
 import six
 from libcpp.string cimport string
-from libcpp.list cimport list
 from libcpp.vector cimport vector
 from cython.operator cimport dereference as deref, preincrement as inc
 from cpython.version cimport PY_MAJOR_VERSION
@@ -40,6 +39,9 @@ from .PyXMLDocument cimport XMLDocument
 from .PyXMLDocument cimport XMLNode
 from .PyIncludes cimport *
 
+cdef extern from "astra/PluginAlgorithm.h" namespace "astra":
+    object XMLNode2dict(XMLNode)
+
 
 cdef Config * dictToConfig(string rootname, dc):
     cdef Config * cfg = new Config()
@@ -91,6 +93,8 @@ cdef void readDict(XMLNode root, _dc):
     dc = convert_item(_dc)
     for item in dc:
         val = dc[item]
+        if isinstance(val, list):
+            val = np.array(val,dtype=np.float64)
         if isinstance(val, np.ndarray):
             if val.size == 0:
                 break
@@ -142,69 +146,3 @@ cdef void readOptions(XMLNode node, dc):
 cdef configToDict(Config *cfg):
     return XMLNode2dict(cfg.self)
 
-def castString3(input):
-    return input.decode('utf-8')
-
-def castString2(input):
-    return input
-
-if six.PY3:
-    castString = castString3
-else:
-    castString = castString2
-
-def stringToPythonValue(inputIn):
-    input = castString(inputIn)
-    # matrix
-    if ';' in input:
-        row_strings = input.split(';')
-        col_strings = row_strings[0].split(',')
-        nRows = len(row_strings)
-        nCols = len(col_strings)
-
-        out = np.empty((nRows,nCols))
-        for ridx, row in enumerate(row_strings):
-            col_strings = row.split(',')
-            for cidx, col in enumerate(col_strings):
-                out[ridx,cidx] = float(col)
-        return out
-
-    # vector
-    if ',' in input:
-        items = input.split(',')
-        out = np.empty(len(items))
-        for idx,item in enumerate(items):
-            out[idx] = float(item)
-        return out
-
-    try:
-        # integer
-        return int(input)
-    except ValueError:
-        try:
-            #float
-            return float(input)
-        except ValueError:
-            # string
-            return str(input)
-
-
-cdef XMLNode2dict(XMLNode node):
-    cdef XMLNode subnode
-    cdef list[XMLNode] nodes
-    cdef list[XMLNode].iterator it
-    dct = {}
-    opts = {}
-    if node.hasAttribute(six.b('type')):
-        dct['type'] = castString(node.getAttribute(six.b('type')))
-    nodes = node.getNodes()
-    it = nodes.begin()
-    while it != nodes.end():
-        subnode = deref(it)
-        if castString(subnode.getName())=="Option":
-            opts[castString(subnode.getAttribute('key'))] = stringToPythonValue(subnode.getAttribute('value'))
-        else:
-            dct[castString(subnode.getName())] = stringToPythonValue(subnode.getContent())
-        inc(it)
-    if len(opts)>0: dct['options'] = opts
-    return dct