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

Changed the directory structure for gp

Browse source 
now: eoParseTree <-- the eoParseTree class
     eoParseTreeDepthInit <-- the eoParseTree depth initializer (eoGpDepthInitializer)
     eoParseTreeOp <-- the operators (xover and mutation)

base documentation written for:
* eoParseTree
* eoGpDepthInitializer
* eoSubtreeXOver
* eoBranchMutation
* eoPointMutation
* eoExpansionMutation
* eoCollapseSubtreeMutation
* eoHoistMutation

I also created a group ParseTree which contains all classes related to eoParseTree

eoGpMutate.h has been removed (merged with eoParseTree operators into eoParseTreeOp
This commit is contained in:
jeggermo 2001-07-02 13:31:04 +00:00
commit a611939e68
7 changed files with 340 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

10
eo/app/gpsymreg/fitness.h
View file

@ -43,7 +43,7 @@ using namespace std;
class MinimizingFitnessTraits : public eoParetoFitnessTraits
{
public :
static bool maximizing(int which) { return false;} // we want to minimize both fitnesses}
static bool maximizing(int which) { return false;} // we want to minimize both fitnesses
static unsigned nObjectives() { return 2;} // the number of fitnesses }
};
@ -148,7 +148,7 @@ void init(vector<TreeNode> &initSequence)
}
// next we add the unary functions
/*
initSequence.push_back( NEGATE );
initSequence.push_back( SIN );
initSequence.push_back( COS );
@ -162,14 +162,14 @@ void init(vector<TreeNode> &initSequence)
initSequence.push_back( MULTIPLIES );
initSequence.push_back( DIVIDE );
initSequence.push_back( POW );
*/
// and the binary operators
initSequence.push_back( OpPLUS);
initSequence.push_back( OpMINUS );
/*
initSequence.push_back( OpMULTIPLIES );
initSequence.push_back( OpDIVIDE );
*/
initSequence.push_back( OpPOW );

5
eo/app/gpsymreg/main.cc
View file

@ -23,7 +23,6 @@
#include <iostream>
#include <gp/eoParseTree.h>
#include <gp/eoGpMutate.h>
#include <eo>
using namespace gp_parse_tree;
@ -84,7 +83,9 @@ int main(int argc, char *argv[])
// define X-OVER
eoSubtreeXOver<FitnessType, Node> xover(parameter.MaxSize);
eoSubtreeXOver<FitnessType, Node> xover(parameter.MaxSize);
// define MUTATION
eoBranchMutation<FitnessType, Node> mutation(initializer, parameter.MaxSize);
// eoExpansionMutation<FitnessType, Node> mutation(initializer, parameter.MaxSize);