From a1fffff0455966a1e0ab5e361363d4a2d069e14f Mon Sep 17 00:00:00 2001 From: evomarc Date: Fri, 12 Apr 2002 14:39:58 +0000 Subject: [PATCH] Changing the include file that contain all include from eoparadiseo to eoparadiseo.h because teh CVS tool in Microsoft Windaube doesn't make the difference with the directory ParadisEO --- eo/src/{paradiseo => paradiseo.h} | 0 eo/tutorial/ParadisEO/Lesson1/IslandBitEA.cpp | 2 +- eo/tutorial/ParadisEO/Lesson1/IslandBitEA1.cpp | 2 +- eo/tutorial/ParadisEO/Lesson1/IslandBitEA2.cpp | 2 +- eo/tutorial/ParadisEO/Lesson1/Makefile | 14 ++++++++------ eo/tutorial/ParadisEO/Lesson2/Makefile | 10 ++++++---- .../ParadisEO/Lesson2/MasterDistEvalBitEA.cpp | 2 +- .../ParadisEO/Lesson2/SlaveDistEvalBitEA.cpp | 2 +- 8 files changed, 19 insertions(+), 15 deletions(-) rename eo/src/{paradiseo => paradiseo.h} (100%) diff --git a/eo/src/paradiseo b/eo/src/paradiseo.h similarity index 100% rename from eo/src/paradiseo rename to eo/src/paradiseo.h diff --git a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA.cpp b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA.cpp index 1793bc67..2b2b1024 100644 --- a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA.cpp +++ b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA.cpp @@ -1,4 +1,4 @@ -#include +#include #include typedef eoBit Indi; // A bitstring with fitness double diff --git a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA1.cpp b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA1.cpp index f984bf81..17d47d21 100644 --- a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA1.cpp +++ b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA1.cpp @@ -1,4 +1,4 @@ -#include +#include #include typedef eoBit Indi; // A bitstring with fitness double diff --git a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA2.cpp b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA2.cpp index b3e89644..98a9b2b5 100644 --- a/eo/tutorial/ParadisEO/Lesson1/IslandBitEA2.cpp +++ b/eo/tutorial/ParadisEO/Lesson1/IslandBitEA2.cpp @@ -1,4 +1,4 @@ -#include +#include #include typedef eoBit Indi; // A bitstring with fitness double diff --git a/eo/tutorial/ParadisEO/Lesson1/Makefile b/eo/tutorial/ParadisEO/Lesson1/Makefile index 3008b72e..d96cfe1c 100644 --- a/eo/tutorial/ParadisEO/Lesson1/Makefile +++ b/eo/tutorial/ParadisEO/Lesson1/Makefile @@ -1,3 +1,5 @@ +MPICC = ./mpiCC + ALL = IslandBitEA IslandBitEA2 IslandBitEA1 lesson2 : IslandBitEA IslandBitEA2 IslandBitEA1 @@ -8,20 +10,20 @@ clean : @/bin/rm $(ALL) *.o *~ IslandBitEA : IslandBitEA.o - mpiCC -DPACKAGE=\"eo\" -o IslandBitEA IslandBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a + $(MPICC) -DPACKAGE=\"eo\" -o IslandBitEA IslandBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a IslandBitEA.o : IslandBitEA.cpp binary_value.h - mpiCC -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA.cpp + $(MPICC) -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA.cpp IslandBitEA1 : IslandBitEA1.o - mpiCC -DPACKAGE=\"eo\" -o IslandBitEA1 IslandBitEA1.o ../../../src/utils/libeoutils.a ../../../src/libeo.a + $(MPICC) -DPACKAGE=\"eo\" -o IslandBitEA1 IslandBitEA1.o ../../../src/utils/libeoutils.a ../../../src/libeo.a IslandBitEA1.o : IslandBitEA1.cpp binary_value.h - mpiCC -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA1.cpp + $(MPICC) -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA1.cpp IslandBitEA2 : IslandBitEA2.o - mpiCC -DPACKAGE=\"eo\" -o IslandBitEA2 IslandBitEA2.o ../../../src/utils/libeoutils.a ../../../src/libeo.a + $(MPICC) -DPACKAGE=\"eo\" -o IslandBitEA2 IslandBitEA2.o ../../../src/utils/libeoutils.a ../../../src/libeo.a IslandBitEA2.o : IslandBitEA2.cpp binary_value.h - mpiCC -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA2.cpp + $(MPICC) -DPACKAGE=\"eo\" -I. -I../../../src -c IslandBitEA2.cpp diff --git a/eo/tutorial/ParadisEO/Lesson2/Makefile b/eo/tutorial/ParadisEO/Lesson2/Makefile index 12b365ea..ae927b08 100644 --- a/eo/tutorial/ParadisEO/Lesson2/Makefile +++ b/eo/tutorial/ParadisEO/Lesson2/Makefile @@ -1,3 +1,5 @@ +MPICC = ./mpiCC + ALL = MasterDistEvalBitEA SlaveDistEvalBitEA lesson2 : MasterDistEvalBitEA SlaveDistEvalBitEA @@ -8,14 +10,14 @@ clean : @/bin/rm $(ALL) *.o *~ MasterDistEvalBitEA : MasterDistEvalBitEA.o - mpiCC -DPACKAGE=\"eo\" -o MasterDistEvalBitEA MasterDistEvalBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a + $(MPICC) -DPACKAGE=\"eo\" -o MasterDistEvalBitEA MasterDistEvalBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a MasterDistEvalBitEA.o : MasterDistEvalBitEA.cpp binary_value.h - mpiCC -DPACKAGE=\"eo\" -I. -I../../../src -c MasterDistEvalBitEA.cpp + $(MPICC) -DPACKAGE=\"eo\" -I. -I../../../src -c MasterDistEvalBitEA.cpp SlaveDistEvalBitEA : SlaveDistEvalBitEA.o - mpiCC -DPACKAGE=\"eo\" -o SlaveDistEvalBitEA SlaveDistEvalBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a + $(MPICC) -DPACKAGE=\"eo\" -o SlaveDistEvalBitEA SlaveDistEvalBitEA.o ../../../src/utils/libeoutils.a ../../../src/libeo.a SlaveDistEvalBitEA.o : SlaveDistEvalBitEA.cpp binary_value.h - mpiCC -DPACKAGE=\"eo\" -I. -I../../../src -c SlaveDistEvalBitEA.cpp + $(MPICC) -DPACKAGE=\"eo\" -I. -I../../../src -c SlaveDistEvalBitEA.cpp diff --git a/eo/tutorial/ParadisEO/Lesson2/MasterDistEvalBitEA.cpp b/eo/tutorial/ParadisEO/Lesson2/MasterDistEvalBitEA.cpp index 978fd556..b2b154ff 100644 --- a/eo/tutorial/ParadisEO/Lesson2/MasterDistEvalBitEA.cpp +++ b/eo/tutorial/ParadisEO/Lesson2/MasterDistEvalBitEA.cpp @@ -2,7 +2,7 @@ #include #include -#include +#include #include typedef eoBit Indi ; // A bitstring with fitness double diff --git a/eo/tutorial/ParadisEO/Lesson2/SlaveDistEvalBitEA.cpp b/eo/tutorial/ParadisEO/Lesson2/SlaveDistEvalBitEA.cpp index 590d3d88..5194d789 100644 --- a/eo/tutorial/ParadisEO/Lesson2/SlaveDistEvalBitEA.cpp +++ b/eo/tutorial/ParadisEO/Lesson2/SlaveDistEvalBitEA.cpp @@ -2,7 +2,7 @@ #include // cout #include // ostrstream, istrstream -#include +#include #include typedef eoBit Indi; // A bitstring with fitness double