From b5606ad11aa0c1559a8c098a36c49533a68a174e Mon Sep 17 00:00:00 2001 From: gustavo Date: Fri, 31 Mar 2000 16:23:16 +0000 Subject: [PATCH] Maarten was right --- eo/src/eoAtomCreep.h | 2 +- eo/src/eoAtomMutation.h | 2 +- eo/src/eoGOpSelector.h | 2 +- eo/src/eoWrappedOps.h | 2 +- eo/src/es/eoESFullChrom.h | 4 ++-- eo/src/es/eoESFullMut.h | 6 +++--- eo/test/Makefile.am | 11 +++++++++-- eo/test/real_value.h | 2 +- eo/test/t-eoAtomOps.cpp | 2 +- eo/test/t-eoESFull.cpp | 2 +- eo/test/t-eoESOps.cpp | 6 +++--- eo/test/t-eoGOpSel.cpp | 4 ++-- eo/test/t-eoGeneralOps.cpp | 2 +- eo/test/t-eobreeder.cpp | 4 ++-- eo/test/t-eoinclusion.cpp | 2 +- eo/test/t-parser.cpp | 6 +++--- eo/test/t-selectOne.cpp | 4 ++-- 17 files changed, 35 insertions(+), 28 deletions(-) diff --git a/eo/src/eoAtomCreep.h b/eo/src/eoAtomCreep.h index b31c56baa..05fda7642 100644 --- a/eo/src/eoAtomCreep.h +++ b/eo/src/eoAtomCreep.h @@ -25,7 +25,7 @@ #ifndef _EOATOMCREEP_H #define _EOATOMCREEP_H -#include +#include #include /** With uniform probability, decrements or increments by one the value. diff --git a/eo/src/eoAtomMutation.h b/eo/src/eoAtomMutation.h index 7d86d521b..3ecec82f7 100644 --- a/eo/src/eoAtomMutation.h +++ b/eo/src/eoAtomMutation.h @@ -30,7 +30,7 @@ // EO includes #include #include -#include +#include #include /** Atomic mutation of an EO. Acts on containers, and applies a mutation diff --git a/eo/src/eoGOpSelector.h b/eo/src/eoGOpSelector.h index 91ecca3b3..c2ec4fa43 100644 --- a/eo/src/eoGOpSelector.h +++ b/eo/src/eoGOpSelector.h @@ -34,7 +34,7 @@ #include #include "eoOpSelector.h" #include "eoWrappedOps.h" // for eoCombinedOp -#include "eoRNG.h" +#include using namespace std; diff --git a/eo/src/eoWrappedOps.h b/eo/src/eoWrappedOps.h index 10e4fb36e..83b99bdbd 100644 --- a/eo/src/eoWrappedOps.h +++ b/eo/src/eoWrappedOps.h @@ -32,7 +32,7 @@ //----------------------------------------------------------------------------- #include // eoOp, eoMonOp, eoBinOp -#include "eoRNG.h" +#include using namespace std; diff --git a/eo/src/es/eoESFullChrom.h b/eo/src/es/eoESFullChrom.h index 85bd4f228..04090c466 100644 --- a/eo/src/es/eoESFullChrom.h +++ b/eo/src/es/eoESFullChrom.h @@ -34,7 +34,7 @@ // EO includes #include -#include +#include /**@name Chromosomes for evolution strategies Each chromosome in an evolution strategies is composed of a vector of floating point values plus a vector of sigmas, that are added to them during mutation and a vector of correlations @@ -84,7 +84,7 @@ class eoESFullChrom : public eoVector { /* And now the useful constructor: from a parser (should be in the factory, if such a thing exists one day for eoESFullChrom */ - eoESFullChrom(Parser & parser) : StdDev(0), CorCff(0) { + eoESFullChrom(eoParser & parser) : StdDev(0), CorCff(0) { parser.AddTitle("Description of ES individuals"); int num_genes, num_sigma; bool correlated_mutations; diff --git a/eo/src/es/eoESFullMut.h b/eo/src/es/eoESFullMut.h index 37b6c4724..d4cc7ce72 100644 --- a/eo/src/es/eoESFullMut.h +++ b/eo/src/es/eoESFullMut.h @@ -29,11 +29,11 @@ #ifndef _EOESMUT_H #define _EOESMUT_H -#include -#include +#include +#include #include // for exp -#include +#include #include #ifndef M_PI diff --git a/eo/test/Makefile.am b/eo/test/Makefile.am index e11388113..075e54424 100644 --- a/eo/test/Makefile.am +++ b/eo/test/Makefile.am @@ -9,7 +9,7 @@ EXTRA_DIST = LICENSE ############################################################################### -INCLUDES = -I$(top_builddir)/src -I$(top_builddir)/src/es -I$(top_builddir)/src/ga -I$(top_builddir)/src/gp -I$(top_builddir)/src/obsolete -I$(top_builddir)/src/utils +INCLUDES = -I$(top_builddir)/src LDADDS = $(top_builddir)/src/libeo.a $(top_builddir)/src/obsolete/libeoobsolete.a $(top_builddir)/src/utils/libeoutils.a ############################################################################### @@ -18,7 +18,7 @@ noinst_PROGRAMS = t-eobreeder t-eoinclusion t-eoinsertion t-eo t-eofitness \ t-eoproblem t-eobin t-eolottery t-eo2dVector t-eogeneration t-eoEasyEA\ t-eoNonUniform t-eoUniform t-eoRandom t-parser t-eoESFull t-eoESOps\ t-eoAtomOps t-selectOne t-eoaltbreeder t-eoGeneralOps t-eoGOpSel \ - t-eoVector + t-eoVector t-eoCheckpointing ############################################################################### @@ -177,3 +177,10 @@ t_parser_LDFLAGS = -lm t_parser_LDADD = $(LDADDS) ############################################################################### + +t_eoCheckpointing_SOURCES = t-eoCheckpointing.cpp +t_eoCheckpointing_DEPENDENCIES = $(DEPS) +t_eoCheckpointing_LDFLAGS = -lm +t_eoCheckpointing_LDADD = $(LDADDS) + +############################################################################### diff --git a/eo/test/real_value.h b/eo/test/real_value.h index 68415519e..324ecae8d 100644 --- a/eo/test/real_value.h +++ b/eo/test/real_value.h @@ -1,4 +1,4 @@ -#include +#include //----------------------------------------------------------------------------- diff --git a/eo/test/t-eoAtomOps.cpp b/eo/test/t-eoAtomOps.cpp index 715fffc5e..020c30173 100644 --- a/eo/test/t-eoAtomOps.cpp +++ b/eo/test/t-eoAtomOps.cpp @@ -42,7 +42,7 @@ using namespace std; #include // Several EOs -#include +#include // RNGs #include diff --git a/eo/test/t-eoESFull.cpp b/eo/test/t-eoESFull.cpp index 71df2f2e3..eae0e9811 100644 --- a/eo/test/t-eoESFull.cpp +++ b/eo/test/t-eoESFull.cpp @@ -32,7 +32,7 @@ main(int argc, char *argv[]) { // bool comma; // Create the command-line parser - Parser parser( argc, argv, "Basic EA for vector with adaptive mutations"); + eoParser parser( argc, argv, "Basic EA for vector with adaptive mutations"); // Define Parameters and load them eoValueParam& seed = parser.createParam(time(0), "seed", "Random number seed"); diff --git a/eo/test/t-eoESOps.cpp b/eo/test/t-eoESOps.cpp index 253a830e5..dc25ca99f 100644 --- a/eo/test/t-eoESOps.cpp +++ b/eo/test/t-eoESOps.cpp @@ -11,16 +11,16 @@ using namespace std; // general -#include // though contained in all others! +#include // though contained in all others! // evolution specific #include //#include //#include // representation specific -#include // though contained in following +#include // though contained in following //#include -#include +#include //#include // this fitness #include "real_value.h" // the sphere fitness diff --git a/eo/test/t-eoGOpSel.cpp b/eo/test/t-eoGOpSel.cpp index 3f7e41110..278303d51 100644 --- a/eo/test/t-eoGOpSel.cpp +++ b/eo/test/t-eoGOpSel.cpp @@ -28,9 +28,9 @@ // to avoid long name warnings #pragma warning(disable:4786) -#include "eoBin.h" // eoBin, eoPop, eoBreeder +#include // eoBin, eoPop, eoBreeder #include -#include +#include #include //#include diff --git a/eo/test/t-eoGeneralOps.cpp b/eo/test/t-eoGeneralOps.cpp index a14612125..821a82b18 100644 --- a/eo/test/t-eoGeneralOps.cpp +++ b/eo/test/t-eoGeneralOps.cpp @@ -43,7 +43,7 @@ using namespace std; #include // Several EOs -#include +#include // generalOp we are testing #include diff --git a/eo/test/t-eobreeder.cpp b/eo/test/t-eobreeder.cpp index d08b308d3..8b7fa2d73 100644 --- a/eo/test/t-eobreeder.cpp +++ b/eo/test/t-eobreeder.cpp @@ -27,9 +27,9 @@ // to avoid long name warnings #pragma warning(disable:4786) -#include // eoBin, eoPop, eoBreeder +#include // eoBin, eoPop, eoBreeder #include -#include +#include #include #include diff --git a/eo/test/t-eoinclusion.cpp b/eo/test/t-eoinclusion.cpp index c0d3494c7..e2d49ae83 100644 --- a/eo/test/t-eoinclusion.cpp +++ b/eo/test/t-eoinclusion.cpp @@ -2,7 +2,7 @@ // t-eoinclusion.cpp //----------------------------------------------------------------------------- -#include +#include #include #include diff --git a/eo/test/t-parser.cpp b/eo/test/t-parser.cpp index 222039e3e..492d58a46 100644 --- a/eo/test/t-parser.cpp +++ b/eo/test/t-parser.cpp @@ -7,11 +7,11 @@ (c) geneura team, 1999 -----------------------------------------------------------------------------*/ -#include -#include +#include +#include #include -void GetOutputParam(Parser & parser, +void GetOutputParam(eoParser & parser, string & _string) { try { diff --git a/eo/test/t-selectOne.cpp b/eo/test/t-selectOne.cpp index a6848a719..8304c5033 100644 --- a/eo/test/t-selectOne.cpp +++ b/eo/test/t-selectOne.cpp @@ -27,9 +27,9 @@ // to avoid long name warnings #pragma warning(disable:4786) -#include // eoBin, eoPop, eoBreeder +#include // eoBin, eoPop, eoBreeder #include -#include +#include #include #include