Skip to content

Commit

Permalink
shortens line widths, updates version
Browse files Browse the repository at this point in the history
  • Loading branch information
lacava committed Aug 2, 2017
1 parent 2b6b9a4 commit be1b7e9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
2 changes: 1 addition & 1 deletion few/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
"""

__version__ = '0.0.44'
__version__ = '0.0.45'
17 changes: 4 additions & 13 deletions few/lib/few_lib.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -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))

0 comments on commit be1b7e9

Please sign in to comment.