diff --git a/few/_version.py b/few/_version.py index 123755b..c65dc2f 100644 --- a/few/_version.py +++ b/few/_version.py @@ -6,4 +6,4 @@ """ -__version__ = '0.0.44' +__version__ = '0.0.45' diff --git a/few/lib/few_lib.pyx b/few/lib/few_lib.pyx index 2e754d1..2ab4dab 100644 --- a/few/lib/few_lib.pyx +++ b/few/lib/few_lib.pyx @@ -7,20 +7,11 @@ from libcpp cimport bool cdef extern from "epsilon_lexicase.h": cdef void _epsilon_lexicase "epsilon_lexicase"(Map[ArrayXXd] & F, int n, int d, int num_selections, - Map[ArrayXi] & locs, bool lex_size, Map[ArrayXi] &sizes) + Map[ArrayXi] & locs, bool lex_size, + Map[ArrayXi] &sizes) # This will be exposed to Python -def ep_lex(np.ndarray F, int n, int d, int num_selections, np.ndarray locs, bool lex_size, np.ndarray sizes): +def ep_lex(np.ndarray F, int n, int d, int num_selections, np.ndarray locs, bool lex_size, + np.ndarray sizes): return _epsilon_lexicase(Map[ArrayXXd](F), n, d, num_selections, Map[ArrayXi](locs), lex_size, Map[ArrayXi](sizes)) -# WIP -# cdef extern from "evaluation.h": -# cdef void _evaluate "evaluate"(node n, Map[ArrayXXd] & features, -# vector[Map[ArrayXd]]] stack_float, -# vector[Map[ArrayXb]] stack_bool) - -# def evaluate(node n, np.ndarray features, vector[np.ndarray] stack_float, -# vector[np.ndarray] stack_bool): -# return _evaluate(node n, Map[ArrayXXd](features), -# vector[Map[ArrayXd]]](stack_float), -# vector[Map[ArrayXb]](stack_bool))