Skip to content

GitLab

Commit c49036e4 authored by maitre's avatar maitre
Browse files

Enhanced pre-version of tgp with STD tpl

parent 3df51b17
Hide whitespace changes
Inline Side-by-side
EaseaLex.l
View file @ c49036e4
......@@ -376,6 +376,15 @@ exponent ([Ee][+-]?[0-9]+)
fprintf(fpOutputFile," {for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/pSym->Object->pType->nSize);
fprintf(fpOutputFile," %s[EASEA_Ndx]=genome.%s[EASEA_Ndx];}\n",pSym->Object->sName,pSym->Object->sName);
}
else if( pSym->Object->ObjectType==oArrayPointer ){
// here we handle array of pointer (developped for Tree GP)
fprintf(fpOutputFile," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/sizeof(char*));
fprintf(fpOutputFile," if(genome.%s[EASEA_Ndx]) %s[EASEA_Ndx] = new %s(*(genome.%s[EASEA_Ndx]));\n",pSym->Object->sName,
pSym->Object->sName,pSym->Object->pType->sName,pSym->Object->sName);
fprintf(fpOutputFile," else %s[EASEA_Ndx] = NULL;\n",pSym->Object->sName);
}
}
}
<TEMPLATE_ANALYSIS>"\\GENOME_DTOR" {
......@@ -383,11 +392,18 @@ exponent ([Ee][+-]?[0-9]+)
if (bVERBOSE) printf ("Creating default destructor.\n");
fprintf (fpOutputFile,"// Destructing pointers\n");
pGENOME->pSymbolList->reset();
while (pSym=pGENOME->pSymbolList->walkToNextItem())
while (pSym=pGENOME->pSymbolList->walkToNextItem()){
if (pSym->Object->ObjectType==oPointer){
fprintf(fpOutputFile," if (%s) delete %s;\n %s=NULL;\n",pSym->Object->sName,pSym->Object->sName,pSym->Object->sName);
}
else if( pSym->Object->ObjectType==oArrayPointer ){
// here we handle array of pointer (developped for Tree GP)
fprintf(fpOutputFile," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/sizeof(char*));
fprintf(fpOutputFile," if(%s[EASEA_Ndx]) delete %s[EASEA_Ndx];\n",pSym->Object->sName,pSym->Object->sName,pSym->Object->pType->sName,pSym->Object->sName);
}
}
}
<TEMPLATE_ANALYSIS>"\\EQUAL" {
CListItem<CSymbol*> *pSym;
if (bVERBOSE) printf ("Creating default diversity test.\n");
......@@ -402,6 +418,12 @@ exponent ([Ee][+-]?[0-9]+)
fprintf(fpOutputFile," {for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/pSym->Object->pType->nSize);
fprintf(fpOutputFile," if (%s[EASEA_Ndx]!=genome.%s[EASEA_Ndx]) return 0;}\n",pSym->Object->sName,pSym->Object->sName);
}
else if( pSym->Object->ObjectType==oArrayPointer ){
// here we handle array of pointer (developped for Tree GP)
fprintf(fpOutputFile," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/sizeof(char*));
fprintf(fpOutputFile," if(%s[EASEA_Ndx] != genome.%s[EASEA_Ndx]) return 0;\n",pSym->Object->sName,pSym->Object->sName,pSym->Object->pType->sName,pSym->Object->sName);
}
}
}
<TEMPLATE_ANALYSIS>"\\COMPARE" {
......
EaseaSym.cpp
View file @ c49036e4
......@@ -149,7 +149,7 @@ void CSymbol::print(FILE *fp){
if (pSym->Object->ObjectType==oPointer)
fprintf(fp," %s=NULL;\n",pSym->Object->sName);
if (pSym->Object->ObjectType==oArrayPointer){
fprintf(fp," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/pSym->Object->pType->nSize);
fprintf(fp," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/sizeof(char*));
fprintf(fp," %s[EASEA_Ndx]=NULL;\n",pSym->Object->sName);
}
}
......@@ -167,7 +167,11 @@ void CSymbol::print(FILE *fp){
if (pSym->Object->ObjectType==oPointer){
fprintf(fp," %s=(EASEA_Var.%s ? new %s(*(EASEA_Var.%s)) : NULL);\n",pSym->Object->sName,pSym->Object->sName,pSym->Object->pType->sName,pSym->Object->sName);
}
if( pSym->Object->ObjectType==oArrayPointer ){
fprintf(fp," for(int EASEA_Ndx=0; EASEA_Ndx<%d; EASEA_Ndx++)\n",pSym->Object->nSize/sizeof(char*));
fprintf(fp," if( EASEA_Var.%s[EASEA_Ndx] ) %s[EASEA_Ndx] = new %s(*(EASEA_Var.%s[EASEA_Ndx]));\n",pSym->Object->sName,pSym->Object->sName,pSym->Object->pType->sName,pSym->Object->sName);
fprintf(fp," else %s[EASEA_Ndx] = NULL;\n",pSym->Object->sName);
}
}
fprintf(fp," }\n"); // copy constructor
......@@ -267,6 +271,7 @@ void CSymbol::print(FILE *fp){
fprintf(fpOutputFile,"%s\n",sString);
}
}
fprintf(fp,"// Class members \n"); // Now, we must print the class members
pSymbolList->reset();
while (pSym=pSymbolList->walkToNextItem()){
......
dev/tgp_regression/tgp_regression.ez
View file @ c49036e4
......@@ -5,14 +5,22 @@
__________________________________________________________*/
\User declarations :
#include <gsl/gsl_rng.h>
//#include <gsl/gsl_rng.h>
#include <assert.h>
#include <errno.h>
#include <sstream>
#define OPERAND 0
// number of input variables
#define VAR_LEN 4
#define MAX_ARITY 3
#define VAR_LEN 4
// Here, some well known parameters for GP.
#define MAX_ARITY 3 // maximum arrity for GP nodes
#define NB_TREES 2 // number of co-evolved trees
#define TREE_DEPTH_MIN 4 // minimum size of (initial) trees (included)
#define TREE_DEPTH_MAX 9 // maximum size of (initial) trees (excluded)
#define GROW_FULL_RATIO 0.5 // ratio between grow and full construction method
float** inputs;
float* outputs;
......@@ -21,8 +29,9 @@ float fitnessCasesSetLength;
/* For the sake of simplicity, constant operators become first in the function set
Koza defines 2 operator sets, one for constants, another for function.
*/
enum OPCODE { OP_ERC, OP_LD_INPUT, OP_MUL, OP_ADD, OP_SUB, OP_DIV, OP_SIN, OP_COS, OP_EXP, OPCODE_SIZE };
int opArrity[] = { 0 , 0 , 2 , 2 , 2 , 2 , 1 , 1 , 1 };
enum OPCODE { OP_ERC, OP_LD_INPUT, OP_MUL, OP_ADD, OP_SUB, OP_DIV, OP_SIN, OP_COS, OP_EXP, OPCODE_SIZE };
const string opCodeName[]={ "erc" , "input" , "*" , "+" , "-" , "/" , "sin" , "cos" , "exp" };
int opArrity[] = { 0 , 0 , 2 , 2 , 2 , 2 , 1 , 1 , 1 };
int constLen = 2;
int totalLen = OPCODE_SIZE;
\end
......@@ -66,32 +75,86 @@ int load_data(float*** inputs, float** outputs, string filename){
return loaded_size;
}
/* /\** Full construction method for trees. */
/* *\/ */
/* GPNode full_method( const int constLen, const int totalLen , int currentDepth, */
/* const int maxDepth){ */
/** Recursive construction method for trees.
Koza construction methods. Function set has to be ordered,
with first every terminal nodes and then non-terminal.
@arg constLen : length of terminal function set.
@arg totalLen : length of the function set (non-terminal+terminal)
@arg currentDepth : depth of the origin (sould always be 0, when the function
is directly call)
@arg maxDepth : The maximum depth of the resulting tree.
@arg full : whether the construction method used has to be full (from koza's book)
Otherwise, it will use grow method (defined in the same book).
@return : pointer to the root node of the resulting sub tree
*/
GPNode* construction_method( const int constLen, const int totalLen , int currentDepth,
const int maxDepth, const bool full){
GPNode* node = new GPNode();
/* GPNode* node = (GPNode*)malloc(sizeof(*node)); */
/* if( currentDepth<maxDepth ){ */
/* node->opCode = random(constLen,totalLen); */
/* } */
/* else{ */
/* node->opCode = random(0, constLen); */
/* } */
// first select the opCode for the current Node.
if( full )
if( currentDepth<maxDepth ) node->opCode = random(constLen,totalLen);
else node->opCode = random(0, constLen);
else
if( currentDepth<maxDepth ) node->opCode = random(0, totalLen);
else node->opCode = random(0, constLen);
int arity = opArrity[(int)node->opCode];
node->currentArity = arity;
// construct children (if any)
for( int i=0 ; i<arity ; i++ )
node->children[i] = construction_method(constLen, totalLen, currentDepth+1, maxDepth, full );
/* int arity = opArrity[(int)node->opCode]; */
/* node->children = (GPNode*)malloc(sizeof(GPNode)*arity); */
// affect null to other array cells (if any)
for( int i=arity ; i<MAX_ARITY ; i++ )
node->children[i] = NULL;
/* //DEBUG */
/* printf("selected node : %d arity : %d\n",(node->opCode), arity); */
return node;
}
/* for( int i=0 ; i<arity ; i++ ) */
/* node->children[i] = full_method(constLen, totalLen, currentDepth+1, maxDepth ); */
/* return *node; */
/* } */
/**
This function handles printing of tree.
Every node is identify by its address, in memory,
and labeled by the actual opCode.
On our architecture (64bits, ubuntu 8.04 and gcc-4.3.2)
the long int variable is sufficient to store the address
without any warning.
*/
void toDotFile_r(GPNode* root, FILE* outputFile){
fprintf(outputFile," %ld [label=\"%s\"];\n", (long int)root, opCodeName[(int)root->opCode].c_str());
for( int i=0 ; i<root->currentArity ; i++ ){
fprintf(outputFile,"%ld -> %ld;\n", (long int)root, (long int)root->children[i]);
toDotFile_r( root->children[i] , outputFile);
}
}
/**
This function prints a tree in dot (graphviz format).
This is the entry point for the print operation. (see toDotFile_r,
for the actual function)
@arg root : set of trees, same type than in a individual.
@arg baseFileName : base of filename for the output file.
@arg treeId : the id of the tree to print, in the given set.
*/
void toDotFile(GPNode* root[NB_TREES], const char* baseFileName, int treeId){
std::ostringstream oss;
oss << baseFileName << "-" << treeId << ".gv";
FILE* outputFile = fopen(oss.str().c_str(),"w");
if( !outputFile ){
perror("Opening file for outputing dot representation ");
exit(-1);
}
fprintf(outputFile,"digraph trees {\n");
toDotFile_r( root[treeId], outputFile);
fprintf(outputFile,"}\n");
}
\end
......@@ -108,7 +171,12 @@ int load_data(float*** inputs, float** outputs, string filename){
\After everything else function:
{
//cout << "After everything else function called" << endl;
for( unsigned int i=0 ; i<population->actualParentPopulationSize ; i++ ){
std::ostringstream oss;
oss << "out/indiv-" << i << "-trees" ;
toDotFile( ((IndividualImpl*)population->parents[i])->root,oss.str().c_str(),0);
toDotFile( ((IndividualImpl*)population->parents[i])->root,oss.str().c_str(),1);
}
}
\end
......@@ -128,21 +196,36 @@ int load_data(float*** inputs, float** outputs, string filename){
GPNode {
GPNode* children[MAX_ARITY];
char opCode;
int currentArity;
}
GenomeClass {
GPNode *root;
GPNode* root[NB_TREES];
}
\end
\GenomeClass::display:
{
os << this << " trees addr : " ;
for( int i=0 ; i<NB_TREES ; i++ )
os << Genome.root[i]<< "\t";
}
\end
\GenomeClass::initialiser :
{
int id = EA->population->actualParentPopulationSize;
int currentDepth;
int seg = EA->population->parentPopulationSize/(TREE_DEPTH_MAX-TREE_DEPTH_MIN);
cout << id << " "<< seg<< " " << id/seg << " " << TREE_DEPTH_MIN+id/seg<< endl;
for( int i=0 ; i<NB_TREES ; i++ ){
Genome.root[i] = construction_method( constLen, totalLen , 0, 6,false);
}
}
\end
......@@ -169,7 +252,7 @@ CPPFLAGS+=
Number of generations : 1 // NB_GEN
Time limit: 0 // In seconds, 0 to deactivate
Population size : 10 //POP_SIZE
Offspring size : 10 // 40%
Offspring size : 0 // 40%
Mutation probability : 1 // MUT_PROB
Crossover probability : 1 // XOVER_PROB
Evaluator goal : minimise // Maximise
......
libeasea/CEvolutionaryAlgorithm.cpp
View file @ c49036e4
......@@ -27,6 +27,7 @@
using namespace std;
extern CRandomGenerator* globalRandomGenerator;
extern CEvolutionaryAlgorithm* EA;
void EASEABeginningGenerationFunction(CEvolutionaryAlgorithm* evolutionaryAlgorithm);
void EASEAEndGenerationFunction(CEvolutionaryAlgorithm* evolutionaryAlgorithm);
void EASEAGenerationFunctionBeforeReplacement(CEvolutionaryAlgorithm* evolutionaryAlgorithm);
......
tpl/STD.tpl
View file @ c49036e4
......@@ -27,7 +27,7 @@ float* pEZ_MUT_PROB = NULL;
float* pEZ_XOVER_PROB = NULL;
size_t *EZ_NB_GEN;
size_t *EZ_current_generation;
CEvolutionaryAlgorithm* EA;
int main(int argc, char** argv){
......@@ -38,6 +38,8 @@ int main(int argc, char** argv){
p.setDefaultParameters(argc,argv);
CEvolutionaryAlgorithm* ea = p.newEvolutionaryAlgorithm();
EA = ea;
EASEAInit(argc,argv);
CPopulation* pop = ea->getPopulation();
......@@ -82,7 +84,7 @@ using namespace std;
CRandomGenerator* globalRandomGenerator;
extern CEvolutionaryAlgorithm* EA;
#define STD_TPL
\INSERT_USER_DECLARATIONS
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment