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

fixed some very old and stupid problems

Browse source
This commit is contained in:
jeggermo 2008-11-11 09:51:17 +00:00
commit 462d3ac568
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
eo/src/gp/eoStParseTreeDepthInit.h
View file

@ -32,6 +32,7 @@
#include <eoInit.h>
#include <eoOp.h>
#include <map>
using namespace gp_parse_tree;
@ -90,27 +91,27 @@ class eoStParseTreeDepthInit : public eoInit< eoParseTree<FType, Node> >
unsigned int i=0;
int arity=0;
int type=0;
std::vector<Node> node_std::vector;
std::vector<Node> node_vector;
for(i=0; i < _node.size(); i++)
{
arity = _node[i].arity();
type = _node[i].type();
if(arity==0)
{
node_std::vector = node[type][TERMINAL];
node_std::vector.push_back(_node[i]);
node[type][TERMINAL]= node_std::vector;
node_vector = node[type][TERMINAL];
node_vector.push_back(_node[i]);
node[type][TERMINAL]= node_vector;
}
else
//if (arity != 0) // non-terminal
{
node_std::vector = node[type][NONTERMINAL];
node_std::vector.push_back(_node[i]);
node[type][NONTERMINAL] = node_std::vector;
node_vector = node[type][NONTERMINAL];
node_vector.push_back(_node[i]);
node[type][NONTERMINAL] = node_vector;
}
node_std::vector = node[type][ALL];
node_std::vector.push_back(_node[i]);
node[type][ALL] = node_std::vector;
node_vector = node[type][ALL];
node_vector.push_back(_node[i]);
node[type][ALL] = node_vector;
}
@ -181,7 +182,7 @@ class eoStParseTreeDepthInit : public eoInit< eoParseTree<FType, Node> >
unsigned max_depth;
map < int, map < int, std::vector<Node> > > node;
std::map < int, std::map < int, std::vector<Node> > > node;
int return_type;
bool grow;