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

Changed MGE to the contrib dir. No need to change the prefix, I guess

Browse source
This commit is contained in:
jmerelo 2001-05-17 10:08:25 +00:00
commit 17dc4f9d10
6 changed files with 81 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
eo/test/Makefile.am
View file

@ -8,12 +8,13 @@ DEPS = $(top_builddir)/src/utils/libeoutils.a $(top_builddir)/src/libeo.a
###############################################################################
INCLUDES = -I$(top_builddir)/src
INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/contrib
LDADDS = $(top_builddir)/src/utils/libeoutils.a $(top_builddir)/src/libeo.a
CXXFLAGS = -g -Wall
###############################################################################
check_PROGRAMS = t-eoParetoFitness t-eoPareto t-eofitness t-eoRandom t-eobin t-eoVirus t-MGE t-MGE-control t-eoStateAndParser t-eoCheckpointing t-eoSSGA \
check_PROGRAMS = t-eoParetoFitness t-eoPareto t-eofitness t-eoRandom t-eobin t-eoVirus\
t-MGE t-MGE1bit t-MGE-control t-eoStateAndParser t-eoCheckpointing t-eoSSGA \
t-eoExternalEO t-eoSymreg t-eo t-eoReplacement t-eoSelect t-eoGenOp t-eoGA t-eoReal t-eoVector t-eoESAll
TESTS=run_tests t-eoVector t-eoRandom t-eoSSGA t-eoPareto t-eoParetoFitness
# removing temporarily t-eoESFull
@ -45,6 +46,12 @@ t_eoVirus_LDADD = $(LDADDS)
###############################################################################
t_MGE1bit_SOURCES = t-MGE1bit.cpp binary_value.h
t_MGE1bit_DEPENDENCIES = $(DEPS)
t_MGE1bit_LDADD = $(LDADDS)
###############################################################################
t_MGE_SOURCES = t-MGE.cpp binary_value.h
t_MGE_DEPENDENCIES = $(DEPS)
t_MGE_LDADD = $(LDADDS)

6
eo/test/t-MGE-control.cpp
View file

@ -33,7 +33,7 @@ int main()
eoPop<Chrom> pop;
// Evaluation
RoyalRoad<Chrom> rr( 4 );
RoyalRoad<Chrom> rr( 8 );
eoEvalFuncCounter<Chrom> eval( rr );
eoInitVirus<float> random(CHROM_SIZE, gen);
@ -56,8 +56,8 @@ int main()
eoUBitXover<Chrom> xover;
eoProportionalOp<Chrom> propSel;
eoGeneralBreeder<Chrom> breeder( lottery, propSel );
propSel.add(vm, 0.8);
propSel.add(xover, 0.1);
propSel.add(vm, 0.2);
propSel.add(xover, 0.8);
// Replace a single one
eoCommaReplacement<Chrom> replace;

6
eo/test/t-MGE.cpp
View file

@ -33,7 +33,7 @@ int main()
eoPop<Chrom> pop;
// Evaluation
RoyalRoad<Chrom> rr( 4 );
RoyalRoad<Chrom> rr( 8 );
eoEvalFuncCounter<Chrom> eval( rr );
eoInitVirus<float> random(CHROM_SIZE, gen);
@ -58,10 +58,10 @@ int main()
eoUBitXover<Chrom> xover;
eoProportionalOp<Chrom> propSel;
eoGeneralBreeder<Chrom> breeder( lottery, propSel );
propSel.add(vm, 0.8);
propSel.add(vm, 0.1);
propSel.add(vf, 0.05);
propSel.add(vt, 0.05);
propSel.add(xover, 0.1);
propSel.add(xover, 0.8);
// Replace a single one
eoCommaReplacement<Chrom> replace;