From 462d3ac5683c818ae92a16df1e5a7ab79a26a972 Mon Sep 17 00:00:00 2001 From: jeggermo Date: Tue, 11 Nov 2008 09:51:17 +0000 Subject: [PATCH] fixed some very old and stupid problems --- eo/src/gp/eoStParseTreeDepthInit.h | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/eo/src/gp/eoStParseTreeDepthInit.h b/eo/src/gp/eoStParseTreeDepthInit.h index 3dac6f134..5aeee4e9c 100644 --- a/eo/src/gp/eoStParseTreeDepthInit.h +++ b/eo/src/gp/eoStParseTreeDepthInit.h @@ -32,6 +32,7 @@ #include #include +#include using namespace gp_parse_tree; @@ -90,27 +91,27 @@ class eoStParseTreeDepthInit : public eoInit< eoParseTree > unsigned int i=0; int arity=0; int type=0; - std::vector node_std::vector; + std::vector 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 > unsigned max_depth; - map < int, map < int, std::vector > > node; + std::map < int, std::map < int, std::vector > > node; int return_type; bool grow;