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

eoParseTree printOn and readFrom functions changed for

Browse source 
compatibility with paradisEO

The fitness is now printed in the same way as in eoBit
This commit is contained in:
jeggermo 2002-04-15 12:56:35 +00:00
commit 34c5efdcbf
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
eo/src/gp/eoParseTree.h
View file

@ -66,13 +66,14 @@ public :
/** /**
* Default Constructor * Default Constructor
*/ */
eoParseTree(void) {} eoParseTree(void) : EO<FType>() {}
/** /**
* Copy Constructor * Copy Constructor
* @param tree The tree to copy * @param tree The tree to copy
*/ */
eoParseTree(const parse_tree<Node>& tree) : parse_tree<Node>(tree) {} eoParseTree(const parse_tree<Node>& tree) : EO<FType>(), parse_tree<Node>(tree) {}
eoParseTree(const eoParseTree<FType, Node>& tree) : EO<FType>(), parse_tree<Node>(tree) {}
/** /**
* To prune me to a certain size * To prune me to a certain size
* @param _size My maximum size * @param _size My maximum size
@ -107,8 +108,15 @@ public :
*/ */
void printOn(std::ostream& os) const void printOn(std::ostream& os) const
{ {
os << fitness() << ' '; cerr << "in eoParseTree<...>::printOn(...) " << endl;
EO<FType>::printOn(os);
/*
* old code which caused problems for paradisEO
* now we use EO<FType>::readFrom(is)
*
os << fitness() << ' ';
*/
std::copy(ebegin(), eend(), ostream_iterator<Node>(os)); std::copy(ebegin(), eend(), ostream_iterator<Node>(os));
} }
@ -118,11 +126,18 @@ public :
*/ */
void readFrom(std::istream& is) void readFrom(std::istream& is)
{ {
FType fit; EO<FType>::readFrom(is);
/*
* old code which caused problems for paradisEO
* now we use EO<FType>::readFrom(is)
*
FType fit;
is >> fit; is >> fit;
fitness(fit); fitness(fit);
*/
std::copy(istream_iterator<Node>(is), istream_iterator<Node>(), back_inserter(*this)); std::copy(istream_iterator<Node>(is), istream_iterator<Node>(), back_inserter(*this));
} }
@ -132,6 +147,7 @@ public :
template <class FType, class Node> template <class FType, class Node>
std::ostream& operator<<(std::ostream& os, const eoParseTree<FType, Node>& eot) std::ostream& operator<<(std::ostream& os, const eoParseTree<FType, Node>& eot)
{ {
cerr << "in operator<<(ostream, eoParseTree<...>)" << endl;
eot.printOn(os); eot.printOn(os);
return os; return os;
} }