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
This commit is contained in:
parent
64ca17c66f
commit
a1fffff045
8 changed files with 19 additions and 15 deletions
35
eo/src/paradiseo.h
Normal file
35
eo/src/paradiseo.h
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
|
||||
|
||||
// "paradiseo"
|
||||
|
||||
// (c) OPAC Team, LIFL, 2002
|
||||
|
||||
/* This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
Cont act: cahon@lifl.fr
|
||||
*/
|
||||
|
||||
#include <eo>
|
||||
|
||||
#include <paradisEO/comm/eoListener.h>
|
||||
#include <paradisEO/island/eoIslandsEasyEA.h>
|
||||
#include <paradisEO/island/topologies/eoRingConnectivity.h>
|
||||
#include <paradisEO/island/topologies/eoFullConnectivity.h>
|
||||
#include <paradisEO/island/eoCyclicGenContinue.h>
|
||||
|
||||
#include <paradisEO/eval/eoDistEvalEasyEA.h>
|
||||
#include <paradisEO/eval/eoEvaluator.h>
|
||||
|
||||
// To be continued :-)
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#include <paradiseo>
|
||||
#include <paradiseo.h>
|
||||
#include <ga.h>
|
||||
|
||||
typedef eoBit <double> Indi; // A bitstring with fitness double
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include <paradiseo>
|
||||
#include <paradiseo.h>
|
||||
#include <ga.h>
|
||||
|
||||
typedef eoBit <double> Indi; // A bitstring with fitness double
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
#include <paradiseo>
|
||||
#include <paradiseo.h>
|
||||
#include <ga.h>
|
||||
|
||||
typedef eoBit <double> Indi; // A bitstring with fitness double
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include <iostream>
|
||||
#include <strstream>
|
||||
|
||||
#include <paradiseo>
|
||||
#include <paradiseo.h>
|
||||
#include <ga.h>
|
||||
|
||||
typedef eoBit<double> Indi ; // A bitstring with fitness double
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include <iostream> // cout
|
||||
#include <strstream> // ostrstream, istrstream
|
||||
|
||||
#include <paradiseo>
|
||||
#include <paradiseo.h>
|
||||
#include <ga.h>
|
||||
|
||||
typedef eoBit<double> Indi; // A bitstring with fitness double
|
||||
|
|
|
|||
Reference in a new issue