nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added lambda expression (user/automatically defined functions

Browse source
This commit is contained in:
maartenkeijzer 2005-10-16 15:38:38 +00:00
commit b4f15601cb
9 changed files with 240 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

18
eo/contrib/mathsym/eo_interface/eoSymCrossover.cpp
View file

@ -23,11 +23,11 @@
#include <utils/eoRNG.h>
bool subtree_quad(Sym& a, Sym& b, NodeSelector& select) {
unsigned i = select.select_node(a);
unsigned j = select.select_node(b);
NodeSelector::NodeSelection sel_a = select.select_node(a);
NodeSelector::NodeSelection sel_b = select.select_node(b);
Sym aprime = insert_subtree(a, i, get_subtree(b, j));
Sym bprime = insert_subtree(b, j, get_subtree(a, i));
Sym aprime = insert_subtree(a, sel_a.idx(), sel_b.subtree() );
Sym bprime = insert_subtree(b, sel_b.idx(), sel_a.subtree() );
a = aprime;
b = bprime;
@ -35,16 +35,18 @@ bool subtree_quad(Sym& a, Sym& b, NodeSelector& select) {
}
bool subtree_bin(Sym& a, const Sym& b, NodeSelector& select) {
unsigned i = select.select_node(a);
unsigned j = select.select_node(b);
NodeSelector::NodeSelection sel_a = select.select_node(a);
NodeSelector::NodeSelection sel_b = select.select_node(b);
a = insert_subtree(a, i, get_subtree(b,j));
a = insert_subtree(a, sel_a.idx(), sel_b.subtree());
return true;
}
Sym homologous_binimpl(Sym a, Sym b) {
if(a == b) { return a; } // no point
bool use_a = rng.random(2);
token_t head = (use_a? a : b).token();

2
eo/contrib/mathsym/eo_interface/eoSymMutate.h
View file

@ -36,7 +36,7 @@ class eoSymSubtreeMutate : public eoMonOp<EoType> {
bool operator()(EoType& tomutate) {
unsigned xover_point = node_selector.select_node(tomutate);
unsigned xover_point = node_selector.select_node(tomutate).idx();
// create subtree
Sym newtree = subtree_builder.build_tree(6, true); // TODO, parameterize
static_cast<Sym&>(tomutate) = insert_subtree(tomutate, xover_point, newtree);