Merge branch 'master' of ssh://eodev.git.sourceforge.net/gitroot/eodev/eodev

This commit is contained in:
Caner Candan 2011-05-14 23:45:20 +02:00
commit 73028ac095
57 changed files with 2012 additions and 2662 deletions

View file

@ -1,221 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?fileVersion 4.0.0?>
<cproject>
<storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1914321408">
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<configuration artifactExtension="" artifactName="eo" buildProperties="" description="" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1914321408" name="Preference Configuration" parent="org.eclipse.cdt.build.core.prefbase.cfg">
<folderInfo id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1914321408." name="/" resourcePath="">
<toolChain id="org.eclipse.cdt.build.core.prefbase.toolchain.1017753847" name="No ToolChain" resourceTypeBasedDiscovery="false" superClass="org.eclipse.cdt.build.core.prefbase.toolchain">
<targetPlatform id="org.eclipse.cdt.build.core.prefbase.toolchain.1017753847.1960440496" name=""/>
<builder autoBuildTarget="all" buildPath="${workspace_loc:/eo}" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.settings.default.builder.1416754987" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" superClass="org.eclipse.cdt.build.core.settings.default.builder"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.libs.1072428319" name="holder for library settings" superClass="org.eclipse.cdt.build.core.settings.holder.libs"/>
<tool id="org.eclipse.cdt.build.core.settings.holder.1234505301" name="GNU C++" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.1974397277" languageId="org.eclipse.cdt.core.g++" languageName="GNU C++" sourceContentType="org.eclipse.cdt.core.cxxSource,org.eclipse.cdt.core.cxxHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1935231245" name="GNU C" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.394843886" languageId="org.eclipse.cdt.core.gcc" languageName="GNU C" sourceContentType="org.eclipse.cdt.core.cSource,org.eclipse.cdt.core.cHeader" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
<tool id="org.eclipse.cdt.build.core.settings.holder.1229009969" name="Assembly" superClass="org.eclipse.cdt.build.core.settings.holder">
<inputType id="org.eclipse.cdt.build.core.settings.holder.inType.100097107" languageId="org.eclipse.cdt.core.assembly" languageName="Assembly" sourceContentType="org.eclipse.cdt.core.asmSource" superClass="org.eclipse.cdt.build.core.settings.holder.inType"/>
</tool>
</toolChain>
</folderInfo>
</configuration>
</storageModule>
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1914321408" moduleId="org.eclipse.cdt.core.settings" name="Preference Configuration">
<externalSettings/>
<extensions>
<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="makefileGenerator">
<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<scannerConfigBuildInfo instanceId="preference.org.eclipse.cdt.managedbuilder.core.configurationDataProvider.1914321408">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="makefileGenerator">
<runAction arguments="-f ${project_name}_scd.mk" command="make" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfile">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/${specs_file}" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileCPP">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.cpp" command="g++" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
<profile id="org.eclipse.cdt.managedbuilder.core.GCCWinManagedMakePerProjectProfileC">
<buildOutputProvider>
<openAction enabled="true" filePath=""/>
<parser enabled="true"/>
</buildOutputProvider>
<scannerInfoProvider id="specsFile">
<runAction arguments="-E -P -v -dD ${plugin_state_location}/specs.c" command="gcc" useDefault="true"/>
<parser enabled="true"/>
</scannerInfoProvider>
</profile>
</scannerConfigBuildInfo>
</storageModule>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="Lesson1" path="tutorial/Lesson1" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments></buildArguments>
<buildTarget>Lesson1</buildTarget>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
</buildTargets>
</storageModule>
</cconfiguration>
</storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
<project id="eo.null.849402902" name="eo"/>
</storageModule>
</cproject>

View file

@ -1,25 +0,0 @@
*.la
*.lo
.deps
.libs
Makefile
Makefile.in
aclocal.m4
autom4te.cache
build*
confdefs.h
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
depcomp
install-sh
libtool
missing
mkinstalldirs
stamp-h
stamp-h.in

View file

@ -1,82 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>eo</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/eo}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
<value>clean</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>make</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
<value>all</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.cdt.core.cnature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
<nature>org.eclipse.cdt.core.ccnature</nature>
</natures>
</projectDescription>

File diff suppressed because it is too large Load diff

View file

@ -14,12 +14,11 @@ INCLUDE(eo-conf.cmake OPTIONAL)
# set the project name and other variables
PROJECT(EO)
SET(PROJECT_VERSION_MAJOR 1)
SET(PROJECT_VERSION_MINOR 1)
SET(PROJECT_VERSION_PATCH 1)
#SET(PROJECT_VERSION_MAJOR 1)
#SET(PROJECT_VERSION_MINOR 1)
#SET(PROJECT_VERSION_PATCH 1)
SET(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}" CACHE STRING "Package version" FORCE)
#SET(VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}" CACHE STRING "Global version" FORCE)
SET(VERSION "1.1.1-edge" CACHE STRING "Global version" FORCE)
SET(VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}${PROJECT_VERSION_MISC}" CACHE STRING "Global version" FORCE)
SET(GLOBAL_VERSION "${VERSION}")
SET(PACKAGE_BUGREPORT "eodev-help@sourceforge.net" CACHE STRING "Package bug report" FORCE)
@ -58,7 +57,9 @@ INCLUDE(FindGnuplot)
INCLUDE(CheckLibraryExists)
INCLUDE(ConfigureChecks.cmake)
IF(UNIX)
INCLUDE(ConfigureChecks.cmake)
ENDIF(UNIX)
INCLUDE(Dart OPTIONNAL)

View file

@ -1,22 +1,22 @@
# NOTE: only add something here if it is really needed by EO
include(CheckIncludeFile)
include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
INCLUDE(CheckIncludeFile)
INCLUDE(CheckIncludeFiles)
INCLUDE(CheckSymbolExists)
INCLUDE(CheckFunctionExists)
INCLUDE(CheckLibraryExists)
check_library_exists(m cos "cos in libm" HAVE_LIBM)
CHECK_LIBRARY_EXISTS(m cos "/usr/lib" HAVE_LIBM)
check_include_files(cmath.h "cmath.h" HAVE_CMATH_H)
check_include_files(stdio.h "stdio.h" HAVE_STDIO_H)
check_include_files(stdlib.h "stdlib.h" HAVE_STDLIB_H)
check_include_files(string.h "string.h" HAVE_STRING_H)
check_include_files(strings.h "strings.h" HAVE_STRINGS_H)
check_include_files(malloc.h "malloc.h" HAVE_MALLOC_H)
check_include_files(limits.h "limits.h" HAVE_LIMITS_H)
check_include_files(unistd.h "unistd.h" HAVE_UNISTD_H)
check_include_files(stdint.h "stdint.h" HAVE_STDINT_H)
CHECK_INCLUDE_FILES(math.h "math.h" HAVE_MATH_H)
CHECK_INCLUDE_FILES(stdio.h "stdio.h" HAVE_STDIO_H)
CHECK_INCLUDE_FILES(stdlib.h "stdlib.h" HAVE_STDLIB_H)
CHECK_INCLUDE_FILES(string.h "string.h" HAVE_STRING_H)
CHECK_INCLUDE_FILES(strings.h "strings.h" HAVE_STRINGS_H)
CHECK_INCLUDE_FILES(malloc.h "malloc.h" HAVE_MALLOC_H)
CHECK_INCLUDE_FILES(limits.h "limits.h" HAVE_LIMITS_H)
CHECK_INCLUDE_FILES(unistd.h "unistd.h" HAVE_UNISTD_H)
CHECK_INCLUDE_FILES(stdint.h "stdint.h" HAVE_STDINT_H)
# Use check_symbol_exists to check for symbols in a reliable
@ -26,4 +26,4 @@ check_include_files(stdint.h "stdint.h" HAVE_STDINT_H)
# specific order. Refer to the man page for each symbol for which a
# check is to be added to get the proper set of headers. Example :
#check_symbol_exists(asymbol "symbole.h" HAVE_SYMBOLE)
#check_symbol_exists(asymbol "symbole.h" HAVE_SYMBOLE)

View file

@ -1,19 +1,13 @@
In order to create a new release from the current cvs sources perform the
In order to create a new release from the current repository, perform the
following steps:
- Set version number in configure.in and doc/eo.cfg
- Create a branch named "eo_x.y.z"
- Set version number in eo-conf.cmake
- Check/update NEWS file, set release date and version in NEWS.
- Run `make check && make dist`
- Test distribution (unpack, configure, make check)
- Tag released code in cvs, in order to allow a branch to be created at that
version if the necessity will arise later
- Put distribution files at SourceForge
- use the "archive_current.sh" script to create the source archive
- Build the packages
- Put source archive and packages files at SourceForge
- Post news on SourceForge project-page
- Send announcement to mailing lists
- Bump version number to next x.y.z-cvs in configure.in and doc/eo.cfg
- Bump version number to next "x.y.z-edge" in eo-conf.cmake
# Local Variables:
# coding: iso-8859-1
# mode: text
# fill-column: 80
# End:

View file

@ -1,235 +1,86 @@
-----------------------------------------
| WARNING THOSE INSTRUCTIONA ARE OUTDATED |
-----------------------------------------
Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
These are generic installation instructions.
The simplest way to compile the libraries or the provided softwares is to run
one of the script beginnig with "build_". Each script permits to build different
parts of the framework, with different options.
First, you need to generate a configure script using autoconf.
To do this, run the shell script sh ./autogen.sh.
To compile EO you will need CMake and a compiler for your system.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
So far the available scripts for posix systems using g++ are the following:
* build_gcc_linux_release : the most usefull script, build the core libraries in release mode
* build_gcc_linux_debug : build the core libraries with debugging informations in the binaries
* build_gcc_linux_tutorial : build the core libraries and the tutorials
* build_gcc_linux_unittest : build the core libraries and the tests executables
* build_gcc_linux_stl_parallel : build the core libraries enabling STL parallel algorithms (like sorting)
* build_gcc_linux_pyeo : build the core libraries and the python module
* distclean : remove the "release/" and "debug/" directories where the build scripts put the binaries
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
For Windows systems using Visual Studio:
* build_vs2008_release.bat
You may need to adapt the ID to your version of Visual Studio, edit
the "Visual Studio 9 2008" string accordingly.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The libraries are in the "release/lib/" or "debug/lib/" directories.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
2. Type `make' to compile the package.
3. Optionally, type `make check' to run any self-tests that come with
the package.
4. Type `make install' to install the programs and any data files and
documentation.
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
Compilers and Options
=====================
Some systems require unusual options for compilation or linking that
the `configure' script does not know about. Run `./configure --help'
for details on some of the pertinent environment variables.
The build scripts are really simple, take a look at them to see how to use the
build system.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
Basically, the steps are:
0. remove any old build directory that's on the way:
rm -rf build/
1. create a directory in which to put build files:
mkdir build/
2. go in this directory:
cd build/
3. call cmake with the options you want, using the "-D" option and passing the
EO directory as an argument, for example:
cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_CMAKE_TESTING =1 ..
4. now type your favorite "make" command, like:
make -j # use several processors at once when possible
5. enjoy:
./debug/test/t-eofitness
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
Some of the available options are:
* CMAKE_BUILD_TYPE :
* "Debug" : embed debugging informations in the binaries) or
* "Release" : no debugging info and some optimizations (the default)
* ENABLE_EO_TUTORIAL : build the tutorial ("no" by default)
* ENABLE_CMAKE_TESTING : build the tests executables ("no" by default)
* ENABLE_PYEO : build the python module ("no" by default)
*Note Defining Variables::, for more details.
You can pass generic options to the compiler, like:
* _GLIBCXX_PARALLEL : use the parallel version of the STL
Compiling For Multiple Architectures
====================================
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
Installation using packages
===========================
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
To construct a dummy template of the EO package you will need CPack. Be warned
that those do not guarantee correct dependencies and version management.
Installation Names
Use the "package_*" scripts:
* package_deb : for debian-like systems
* package_rpm : for red-hat-like systems
Or go through the following steps:
1. go in the build directory where your binaries are:
cd build/
2. call CPack specifying the desired package system:
cpack -G DEB
3. install the package:
sudo apt-get install EO-1.1.1-Linux.deb
Basic installation
==================
By default, `make install' will install the package's files in
`/usr/local/bin', `/usr/local/man', etc. You can specify an
installation prefix other than `/usr/local' by giving `configure' the
option `--prefix=PATH'.
To install the framework system-wide, copy the "eo/" directory somewhere in your
path. The "lib/" directory should be reachable for the linker and the "src/"
directory must be in the compiler include path.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
give `configure' the option `--exec-prefix=PATH', the package will use
PATH as the prefix for installing programs and libraries.
Documentation and other data files will still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=PATH' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out
automatically, but needs to determine by the type of machine the package
will run on. Usually, assuming the package is built to be run on the
_same_ architectures, `configure' can figure that out, but if it prints
a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the `--target=TYPE' option to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share,
you can create a site shell script called `config.site' that gives
default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
will cause the specified gcc to be used as the C compiler (unless it is
overridden in the site shell script).
`configure' Invocation
======================
`configure' recognizes the following options to control how it
operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.

15
eo/NEWS
View file

@ -1,7 +1,16 @@
* current
- evaluators that throw an exception if a maximum time has en reached (wallclock and CPU user time for POSIX systems), independently of the number of generations
* release 1.2 (10. May. 2011)
- fixed the incremental allocation issue in the variation operator which were
taking too much time for big population sizes
- new class eoParallel enabling parallelization in EO using OpenMP. At this
time, it only concerns the evaluation operator, for advanced details go to
the file test/t-eoParallel.cpp. The default parallelization mode is off, to
switch it on, see the parameters prefixed by --parallelize-*
- pyeo compatible with the last version of Boost and Python libraries
- script installing EO manually in using symbolic links
- evaluators that throw an exception if a maximum time has been reached
(wallclock and CPU user time for POSIX systems), independently of the number of generations
* release 1.1
* release 1.1 (8. Nov. 2010)
- provide cmake build system, remove the old autotools one
- package generation system
- GCC 4.3 compatibility

View file

@ -10,7 +10,7 @@ The latest news about EO can be found on the sourceforge repository at
http://eodev.sourceforge.net/
In case of any problem, please e-mail us at
eodev-help@lists.sourceforge.net, eodev@egroups.com
eodev-main@lists.sourceforge.net
To get started, take a look at the tutorial, starting with
./tutorial/html/eoTutorial.html
@ -18,7 +18,7 @@ To get started, take a look at the tutorial, starting with
The easiest way to start programming a new genome with all EO
evolution engines handy is to create a new standalone EO project from
the tutorial/Templates/ directory. Read Lesson 5 of the tutorial for
an introduction;)
an introduction ;)
==================================================================
@ -26,27 +26,15 @@ an introduction;)
==================================================================
The basic installation procedure goes the following:
Go to your build-directory and run
$(SRCDIR)/configure
make
make check
make install
where $(SRCDIR) is the top-level source directory of EO, i.e. where
the sources where unpacked.
Go to the "eo/" and run one of the "build_*" script. 
Run "$(SRCDIR)/configure --help" for possible options. You can specify
to not build example applications, the tutorial, or to build the
ParadisEO tutorial. You may also change the installation directory
that way.
Using the "build_gcc_linux_release" script is generally what you want. The
binaries are then located in the "release/" directory.
Now you should probably go to the tutorial and start learning about EO
features and programming.
In case of problems, you can read the INSTALL file - but remember this
is a standard installation file from GNU and that it contains nothing
specific about EO.
In case of problems or if you want advanced options, you can read the INSTALL file.
===================================================================
DIRECTORY STRUCTURE
@ -99,12 +87,3 @@ structure:
|
+-- win WINDOWS dir: project files for MS/VC5+
===================================================================
NOTES
===================================================================
If you extracted a fresh snapshot from the cvs-repository, remember
to run
./autogen.sh
in the source-directory before building the libraries.

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,4 +0,0 @@
Makefile.in
Makefile
gprop
.deps

View file

@ -1,3 +0,0 @@
Makefile.in
.deps
Makefile

View file

@ -1,4 +0,0 @@
Makefile.in
Makefile
mastermind
.deps

7
eo/build_gcc_linux_pyeo Executable file
View file

@ -0,0 +1,7 @@
#!/usr/bin/env sh
mkdir -p release
cd release
cmake -DENABLE_PYEO=1 ..
make
cd ..

View file

@ -0,0 +1,7 @@
#!/usr/bin/env sh
mkdir -p release
cd release
cmake -D_GLIBCXX_PARALLEL=1 ..
make
cd ..

View file

@ -1,6 +1,6 @@
#!/usr/bin/env sh
mkdir release
mkdir -p release
cd release
cmake -DENABLE_EO_TUTORIAL=1 ..
make

View file

@ -1,6 +1,6 @@
#!/usr/bin/env sh
mkdir debug
mkdir -p debug
cd debug
cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_CMAKE_TESTING=1 ..
make

1466
eo/config.guess vendored

File diff suppressed because it is too large Load diff

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,6 +0,0 @@
Makefile
Makefile.in
eo.doxytag
html
latex
man

7
eo/eo-conf.cmake Normal file
View file

@ -0,0 +1,7 @@
# Current version
SET(PROJECT_VERSION_MAJOR 1)
SET(PROJECT_VERSION_MINOR 3)
SET(PROJECT_VERSION_PATCH 0)
SET(PROJECT_VERSION_MISC "-edge")

View file

@ -1,6 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in

View file

@ -43,6 +43,9 @@ ADD_SUBDIRECTORY(ga)
ADD_SUBDIRECTORY(gp)
ADD_SUBDIRECTORY(other)
ADD_SUBDIRECTORY(utils)
ADD_SUBDIRECTORY(pyeo)
IF(ENABLE_PYEO)
ADD_SUBDIRECTORY(pyeo)
ENDIF(ENABLE_PYEO)
######################################################################################

View file

@ -3,7 +3,7 @@
//-----------------------------------------------------------------------------
// eoApply.h
// (c) Maarten Keijzer 2000
/*
/*
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
@ -19,7 +19,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
Contact: todos@geneura.ugr.es, http://geneura.ugr.es
mak@dhi.dk
mak@dhi.dk
*/
//-----------------------------------------------------------------------------
@ -94,7 +94,7 @@ void omp_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
//default(none) shared(_proc, _pop, size)
for (size_t i = 0; i < size; ++i)
{
_proc(_pop[i]);
_proc(_pop[i]);
}
}
@ -112,7 +112,7 @@ void omp_dynamic_apply(eoUF<EOT&, void>& _proc, std::vector<EOT>& _pop)
//default(none) shared(_proc, _pop, size)
for (size_t i = 0; i < size; ++i)
{
_proc(_pop[i]);
_proc(_pop[i]);
}
}

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,7 +1,7 @@
//-----------------------------------------------------------------------------
// eo
// (c) GeNeura Team 1998 - 2000
/*
/*
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
@ -23,7 +23,7 @@
#ifdef _MSC_VER
// to avoid long name warnings
#pragma warning(disable:4786)
#endif
#endif
#ifndef _eo_
#define _eo_
@ -62,7 +62,7 @@
// combinations of simple eoOps (eoMonOp and eoQuadOp)
#include <eoProportionalCombinedOp.h>
// didactic (mimics SGA-like variation into an eoGenOp)
// calls crossover and mutation sequentially,
// calls crossover and mutation sequentially,
// with their respective mutation rates
#include <eoSGAGenOp.h>
// its dual: crossover, mutation (and copy) - proportional choice
@ -100,7 +100,7 @@
#include <eoRankingSelect.h>
#include <eoStochTournamentSelect.h>
#include <eoSharingSelect.h>
// Embedding truncation selection
// Embedding truncation selection
#include <eoTruncatedSelectOne.h>
// the batch selection - from an eoSelectOne
@ -165,45 +165,44 @@
// velocities
#include <eoVelocity.h>
#include <eoStandardVelocity.h>
#include <eoExtendedVelocity.h>
#include <eoIntegerVelocity.h>
#include <eoExtendedVelocity.h>
#include <eoIntegerVelocity.h>
#include <eoConstrictedVelocity.h>
#include <eoFixedInertiaWeightedVelocity.h>
#include <eoVariableInertiaWeightedVelocity.h>
#include <eoConstrictedVariableWeightVelocity.h>
#include <eoConstrictedVariableWeightVelocity.h>
// flights
#include <eoFlight.h>
#include <eoStandardFlight.h>
#include <eoStandardFlight.h>
#include <eoVelocityInit.h>
#include <eoBinaryFlight.h>
#include <eoSigBinaryFlight.h>
#include <eoBinaryFlight.h>
#include <eoSigBinaryFlight.h>
// topologies
#include <eoTopology.h>
#include <eoStarTopology.h>
#include <eoLinearTopology.h>
#include <eoRingTopology.h>
#include <eoNeighborhood.h>
#include <eoSocialNeighborhood.h>
// PS algorithms
#include <eoPSO.h>
#include <eoEasyPSO.h>
#include <eoSyncEasyPSO.h>
#include <eoNeighborhood.h>
#include <eoSocialNeighborhood.h>
// PS algorithms
#include <eoPSO.h>
#include <eoEasyPSO.h>
#include <eoSyncEasyPSO.h>
// utils
#include <eoRealBoundModifier.h>
#include <eoRandomRealWeightUp.h>
#include <eoWeightUpdater.h>
#include <eoLinearDecreasingWeightUp.h>
#include <eoGaussRealWeightUp.h>
#include <utils/eoParserLogger.h>
#include <eoGaussRealWeightUp.h>
#include <utils/eoLogger.h>
#include <utils/eoParallel.h>
#endif
#endif
// Local Variables:
// mode: C++

View file

@ -132,7 +132,6 @@ public:
return *this;
}
//! Comparison that separate feasible individuals from unfeasible ones. Feasible are always better
/*!
* Use less as a default comparison operator
@ -160,14 +159,16 @@ public:
}
//! Greater: if the other is lesser than me
bool operator>( const eoDualFitness<BaseType, Compare>& other ) const { return other < *this; }
bool operator>( const eoDualFitness& other ) const { return other < *this; }
//! Less or equal: if the other is not lesser than me
bool operator<=( const eoDualFitness<BaseType, Compare>& other ) const { return !(other < *this); }
bool operator<=( const eoDualFitness& other ) const { return !(other < *this); }
//! Greater or equal: if the other is not greater than me
bool operator>=(const eoDualFitness<BaseType, Compare>& other ) const { return !(*this < other); }
bool operator>=(const eoDualFitness& other ) const { return !(*this < other); }
//! Equal: if the other is equal to me
bool operator==(const eoDualFitness& other) const { return ( _is_feasible == other._is_feasible ) && ( _value == other._value ); }
public:

View file

@ -78,7 +78,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(dummySelect, dummyTransform),
breed(_breed),
mergeReduce(dummyMerge, dummyReduce),
replace(_replace)
replace(_replace),
isFirstCall(true)
{}
/** Ctor taking a breed and merge, an overload of ctor to define an offspring size */
@ -95,7 +96,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(dummySelect, dummyTransform),
breed(_breed),
mergeReduce(dummyMerge, dummyReduce),
replace(_replace)
replace(_replace),
isFirstCall(true)
{
offspring.reserve(_offspringSize); // This line avoids an incremental resize of offsprings.
}
@ -113,7 +115,9 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform (dummySelect, dummyTransform),
breed (_breed),
mergeReduce (dummyMerge, dummyReduce),
replace (_replace) {
replace (_replace),
isFirstCall(true)
{
}
*/
@ -131,7 +135,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(dummySelect, dummyTransform),
breed(_breed),
mergeReduce(dummyMerge, dummyReduce),
replace(_replace)
replace(_replace),
isFirstCall(true)
{}
@ -149,7 +154,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(_select, _transform),
breed(selectTransform),
mergeReduce(dummyMerge, dummyReduce),
replace(_replace)
replace(_replace),
isFirstCall(true)
{}
/// Ctor eoBreed, eoMerge and eoReduce.
@ -166,7 +172,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(dummySelect, dummyTransform),
breed(_breed),
mergeReduce(_merge, _reduce),
replace(mergeReduce)
replace(mergeReduce),
isFirstCall(true)
{}
/// Ctor eoSelect, eoTransform, and eoReplacement
@ -183,7 +190,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(_select, _transform),
breed(selectTransform),
mergeReduce(dummyMerge, dummyReduce),
replace(_replace)
replace(_replace),
isFirstCall(true)
{}
/// Ctor eoSelect, eoTransform, eoMerge and eoReduce.
@ -201,7 +209,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
selectTransform(_select, _transform),
breed(selectTransform),
mergeReduce(_merge, _reduce),
replace(mergeReduce)
replace(mergeReduce),
isFirstCall(true)
{}
@ -210,7 +219,13 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
/// Apply a few generation of evolution to the population.
virtual void operator()(eoPop<EOT>& _pop)
{
_pop.reserve(offspring.capacity());
if (isFirstCall)
{
size_t total_capacity = _pop.capacity() + offspring.capacity();
_pop.reserve(total_capacity);
offspring.reserve(total_capacity);
isFirstCall = false;
}
eoPop<EOT> empty_pop;
@ -293,6 +308,8 @@ template<class EOT> class eoEasyEA: public eoAlgo<EOT>
eoPop<EOT> offspring;
bool isFirstCall;
// Friend classes
friend class eoIslandsEasyEA <EOT> ;
friend class eoDistEvalEasyEA <EOT> ;

View file

@ -90,81 +90,87 @@ Softer selective pressure than pure truncate
template <class EOT> class eoEPReduce : public eoReduce<EOT>
{
public:
typedef typename EOT::Fitness Fitness;
typedef typename EOT::Fitness Fitness;
eoEPReduce(unsigned _t_size ):
t_size(_t_size)
{
if (t_size < 2)
{
eo::log << eo::warnings << "Warning: EP tournament size should be >= 2. Adjusted" << std::endl;
t_size = 2;
}
}
/// helper struct for comparing on std::pairs
// compares the scores
// uses the fitness if scores are equals ????
typedef std::pair<float, typename eoPop<EOT>::iterator> EPpair;
struct Cmp {
bool operator()(const EPpair a, const EPpair b) const
eoEPReduce(unsigned _t_size ):
t_size(_t_size)
{
if (b.first == a.first)
return (*b.second < *a.second);
return b.first < a.first;
if (t_size < 2)
{
eo::log << eo::warnings << "Warning: EP tournament size should be >= 2. Adjusted" << std::endl;
t_size = 2;
}
}
};
/// helper struct for comparing on std::pairs
// compares the scores
// uses the fitness if scores are equals ????
typedef std::pair<float, typename eoPop<EOT>::iterator> EPpair;
struct Cmp {
bool operator()(const EPpair a, const EPpair b) const
{
if (b.first == a.first)
return (*b.second < *a.second);
return b.first < a.first;
}
};
void operator()(eoPop<EOT>& _newgen, unsigned _newsize)
{
unsigned int presentSize = _newgen.size();
void operator()(eoPop<EOT>& _newgen, unsigned _newsize)
{
unsigned int presentSize = _newgen.size();
if (presentSize == _newsize)
if (presentSize == _newsize)
return;
if (presentSize < _newsize)
throw std::logic_error("eoTruncate: Cannot truncate to a larger size!\n");
throw std::logic_error("eoTruncate: Cannot truncate to a larger size!\n");
std::vector<EPpair> scores(presentSize);
for (unsigned i=0; i<presentSize; i++)
{
scores[i].second = _newgen.begin()+i;
Fitness fit = _newgen[i].fitness();
for (unsigned itourn = 0; itourn < t_size; ++itourn)
{
const EOT & competitor = _newgen[rng.random(presentSize)];
if (fit > competitor.fitness())
scores[i].first += 1;
else if (fit == competitor.fitness())
scores[i].first += 0.5;
}
}
{
scores[i].second = _newgen.begin()+i;
Fitness fit = _newgen[i].fitness();
for (unsigned itourn = 0; itourn < t_size; ++itourn)
{
const EOT & competitor = _newgen[rng.random(presentSize)];
if (fit > competitor.fitness())
scores[i].first += 1;
else if (fit == competitor.fitness())
scores[i].first += 0.5;
}
}
// now we have the scores
typename std::vector<EPpair>::iterator it = scores.begin() + _newsize;
std::nth_element(scores.begin(), it, scores.end(), Cmp());
// sort(scores.begin(), scores.end(), Cmp());
unsigned j;
// std::cout << "Les scores apres tri\n";
// for (j=0; j<scores.size(); j++)
// {
// std::cout << scores[j].first << " " << *scores[j].second << std::endl;
// }
eoPop<EOT> tmPop;
// std::cout << "Les scores apres tri\n";
// for (j=0; j<scores.size(); j++)
// {
// std::cout << scores[j].first << " " << *scores[j].second << std::endl;
// }
tmPop.reserve(presentSize);
tmPop.clear();
for (j=0; j<_newsize; j++)
{
tmPop.push_back(*scores[j].second);
}
{
tmPop.push_back(*scores[j].second);
}
_newgen.swap(tmPop);
// erase does not work, but I'm sure there is a way in STL to mark
// and later delete all inside a std::vector ??????
// this would avoid all copies here
// it = scores.begin() + _newsize;
// while (it < scores.end())
// _newgen.erase(it->second);
// it = scores.begin() + _newsize;
// while (it < scores.end())
// _newgen.erase(it->second);
}
private:
unsigned t_size;
unsigned t_size;
eoPop<EOT> tmPop;
};
/** a truncate class that does not sort, but repeatidely kills the worse.
@ -220,7 +226,9 @@ public:
if (oldSize < _newsize)
throw std::logic_error("eoDetTournamentTruncate: Cannot truncate to a larger size!\n");
// Now OK to erase some losers
std::cout << "oldSize - _newsize: " << oldSize - _newsize << std::endl;
for (unsigned i=0; i<oldSize - _newsize; i++)
{
//OLDCODE EOT & eo = inverse_deterministic_tournament<EOT>(_newgen, t_size);

View file

@ -1,8 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in
libcma.a
libes.a

View file

@ -14,26 +14,29 @@ SET(CMA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${ES_LIB_OUTPUT_PATH}) # the same output for the two libs
SET (ES_SOURCES make_algo_scalar_es.cpp
make_algo_scalar_real.cpp
make_checkpoint_es.cpp
make_checkpoint_real.cpp
make_continue_es.cpp
make_continue_real.cpp
make_genotype_es.cpp
make_genotype_real.cpp
make_op_es.cpp
make_op_real.cpp
make_pop_es.cpp
make_pop_real.cpp
make_run_es.cpp
make_run_real.cpp)
SET (CMA_SOURCES eig.cpp
CMAState.cpp
CMAParams.cpp)
SET(ES_SOURCES
make_algo_scalar_es.cpp
make_algo_scalar_real.cpp
make_checkpoint_es.cpp
make_checkpoint_real.cpp
make_continue_es.cpp
make_continue_real.cpp
make_genotype_es.cpp
make_genotype_real.cpp
make_op_es.cpp
make_op_real.cpp
make_pop_es.cpp
make_pop_real.cpp
make_run_es.cpp
make_run_real.cpp
)
SET(CMA_SOURCES
eig.cpp
CMAState.cpp
CMAParams.cpp
)
ADD_LIBRARY(es STATIC ${ES_SOURCES})
INSTALL(TARGETS es ARCHIVE DESTINATION lib COMPONENT libraries)
@ -54,4 +57,3 @@ SET(CMA_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(cma PROPERTIES VERSION "${CMA_VERSION}")
######################################################################################

View file

@ -1,7 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in
libga.a

View file

@ -12,14 +12,15 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET(GA_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${GA_LIB_OUTPUT_PATH})
SET (GA_SOURCES make_algo_scalar_ga.cpp
make_checkpoint_ga.cpp
make_continue_ga.cpp
make_genotype_ga.cpp
make_op_ga.cpp
make_pop_ga.cpp
make_run_ga.cpp)
SET(GA_SOURCES
make_algo_scalar_ga.cpp
make_checkpoint_ga.cpp
make_continue_ga.cpp
make_genotype_ga.cpp
make_op_ga.cpp
make_pop_ga.cpp
make_run_ga.cpp
)
ADD_LIBRARY(ga STATIC ${GA_SOURCES})
INSTALL(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries)
@ -35,4 +36,3 @@ SET(GA_VERSION ${GLOBAL_VERSION})
SET_TARGET_PROPERTIES(ga PROPERTIES VERSION "${GA_VERSION}")
######################################################################################

View file

@ -1,6 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in

View file

@ -1,3 +1,2 @@
FILE(GLOB HDRS *.h)
INSTALL(FILES ${HDRS} DESTINATION include/eo/gp COMPONENT headers)

View file

@ -1,6 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in

View file

@ -1,7 +0,0 @@
*.lo
*.la
.deps
.libs
Makefile
Makefile.in
libeoutils.a

View file

@ -12,24 +12,24 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
SET(EOUTILS_LIB_OUTPUT_PATH ${EO_BINARY_DIR}/lib)
SET(LIBRARY_OUTPUT_PATH ${EOUTILS_LIB_OUTPUT_PATH})
SET (EOUTILS_SOURCES eoData.cpp
eoFileMonitor.cpp
eoGnuplot.cpp
eoGnuplot1DMonitor.cpp
eoGnuplot1DSnapshot.cpp
eoIntBounds.cpp
eoParser.cpp
eoRealBounds.cpp
eoRNG.cpp
eoState.cpp
eoOStreamMonitor.cpp
eoUpdater.cpp
make_help.cpp
pipecom.cpp
eoLogger.cpp
eoParserLogger.cpp
eoParallel.cpp)
SET(EOUTILS_SOURCES
eoData.cpp
eoFileMonitor.cpp
eoGnuplot.cpp
eoGnuplot1DMonitor.cpp
eoGnuplot1DSnapshot.cpp
eoIntBounds.cpp
eoParser.cpp
eoRealBounds.cpp
eoRNG.cpp
eoState.cpp
eoOStreamMonitor.cpp
eoUpdater.cpp
make_help.cpp
pipecom.cpp
eoLogger.cpp
eoParallel.cpp
)
ADD_LIBRARY(eoutils STATIC ${EOUTILS_SOURCES})
INSTALL(TARGETS eoutils ARCHIVE DESTINATION lib COMPONENT libraries)

View file

@ -26,30 +26,31 @@ Authors:
*/
#ifdef _INTERIX
#ifdef _WIN32
#include <io.h>
#else // _INTERIX
#else // _WIN32
#include <unistd.h>
#endif // ! _INTERIX
#endif // ! _WIN32
#include <fcntl.h>
#include <cstdlib>
#include <cstdio> // used to define EOF
#include <iostream>
#include <sstream>
#include <exception>
#include <stdexcept>
#include <locale>
#include "eoLogger.h"
eoLogger eo::log;
eoLogger::eoLogger() :
std::ostream(&_obuf),
eoLogger::eoLogger()
: std::ostream(&_obuf),
_selectedLevel(eo::progress), _contextLevel(eo::quiet),
_fd(2), _obuf(_fd, _contextLevel, _selectedLevel)
_verbose("quiet", "verbose", "Set the verbose level", 'v'),
_printVerboseLevels(false, "print-verbose-levels", "Print verbose levels", 'l'),
_output("", "output", "Redirect a standard output to a file", 'o'),
_selectedLevel(eo::progress),
_contextLevel(eo::quiet),
_fd(2),
_obuf(_fd, _contextLevel, _selectedLevel)
{
_standard_io_streams[&std::cout] = 1;
_standard_io_streams[&std::clog] = 2;
@ -71,18 +72,56 @@ eoLogger::~eoLogger()
if (_fd > 2) { ::close(_fd); }
}
std::string eoLogger::className() const
void eoLogger::_createParameters( eoParser& parser )
{
//------------------------------------------------------------------
// we are saying to eoParser to create the parameters created above.
//------------------------------------------------------------------
std::string section("Logger");
parser.processParam(_verbose, section);
parser.processParam(_printVerboseLevels, section);
parser.processParam(_output, section);
//------------------------------------------------------------------
//------------------------------------------------------------------
// we're gonna redirect the log to the given filename if -o is used.
//------------------------------------------------------------------
if ( ! _output.value().empty() )
{
eo::log << eo::file( _output.value() );
}
//------------------------------------------------------------------
//------------------------------------------------------------------
// // we're gonna print the list of levels if -l parameter is used.
//------------------------------------------------------------------
if ( _printVerboseLevels.value() )
{
eo::log.printLevels();
}
//------------------------------------------------------------------
}
std::string eoLogger::className() const
{
return ("eoLogger");
}
void eoLogger::addLevel(std::string name, eo::Levels level)
void eoLogger::addLevel(std::string name, eo::Levels level)
{
_levels[name] = level;
_sortedLevels.push_back(name);
}
void eoLogger::printLevels() const
void eoLogger::printLevels() const
{
std::cout << "Available verbose levels:" << std::endl;
@ -95,25 +134,25 @@ void eoLogger::printLevels() const
::exit(0);
}
eoLogger& operator<<(eoLogger& l, const eo::Levels lvl)
eoLogger& operator<<(eoLogger& l, const eo::Levels lvl)
{
l._contextLevel = lvl;
return l;
}
eoLogger& operator<<(eoLogger& l, eo::file f)
eoLogger& operator<<(eoLogger& l, eo::file f)
{
l._fd = ::open(f._f.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
return l;
}
eoLogger& operator<<(eoLogger& l, eo::setlevel v)
eoLogger& operator<<(eoLogger& l, eo::setlevel v)
{
l._selectedLevel = (v._lvl < 0 ? l._levels[v._v] : v._lvl);
return l;
}
eoLogger& operator<<(eoLogger& l, std::ostream& os)
eoLogger& operator<<(eoLogger& l, std::ostream& os)
{
if (l._standard_io_streams.find(&os) != l._standard_io_streams.end())
{
@ -128,20 +167,20 @@ eoLogger::outbuf::outbuf(const int& fd,
: _fd(fd), _contextLevel(contexlvl), _selectedLevel(selectedlvl)
{}
int eoLogger::outbuf::overflow(int_type c)
int eoLogger::outbuf::overflow(int_type c)
{
if (_selectedLevel >= _contextLevel)
{
if (_fd >= 0 && c != EOF)
{
ssize_t num;
size_t num;
num = ::write(_fd, &c, 1);
}
}
return c;
}
namespace eo
namespace eo
{
file::file(const std::string f)
: _f(f)
@ -155,3 +194,13 @@ namespace eo
: _v(std::string("")), _lvl(lvl)
{}
}
//! make_verbose gets level of verbose and sets it in eoLogger
void make_verbose(eoParser& parser)
{
eo::log._createParameters( parser );
eo::log << eo::setlevel(eo::log._verbose.value());
}
eoLogger eo::log;

View file

@ -32,15 +32,12 @@ Caner Candan <caner.candan@thalesgroup.com>
Here's an example explaning how to use eoLogger:
\code
#include <iostream>
#include <utils/eoLogger.h>
#include <utils/eoParserLogger.h>
#include <eo>
int main(int ac, char** av)
{
// We are declaring first an overload of eoParser class using Logger
// component.
eoParserLogger parser(ac, av);
// We are declaring the usual eoParser class
eoParser parser(ac, av);
// This call is important to allow -v parameter to change user level.
make_verbose(parser);
@ -88,17 +85,17 @@ Caner Candan <caner.candan@thalesgroup.com>
*/
#ifndef eoLogger_h
# define eoLogger_h
#define eoLogger_h
# include <map>
# include <vector>
# include <string>
# include <iosfwd>
#include <map>
#include <vector>
#include <string>
#include <iosfwd>
# include "eoObject.h"
#include "eoObject.h"
#include "eoParser.h"
namespace eo
namespace eo
{
/**
* Levels contents all the available levels in eoLogger
@ -117,7 +114,7 @@ namespace eo
* file
* this structure combined with the friend operator<< below is an easy way to select a file as output.
*/
struct file
struct file
{
file(const std::string f);
const std::string _f;
@ -127,7 +124,7 @@ namespace eo
* setlevel
* this structure combined with the friend operator<< below is an easy way to set a verbose level.
*/
struct setlevel
struct setlevel
{
setlevel(const std::string v);
setlevel(const Levels lvl);
@ -141,14 +138,14 @@ namespace eo
* Class providing a verbose management through EO
* Use of a global variable eo::log to easily use the logger like std::cout
*/
class eoLogger : public eoObject,
public std::ostream
class eoLogger : public eoObject,
public std::ostream
{
public:
eoLogger();
~eoLogger();
virtual std::string className() const;
virtual std::string className() const;
//! Print the available levels on the standard output
void printLevels() const;
@ -158,107 +155,115 @@ public:
* Use this function if you want to be able to compare selected levels to a given one, like:
* if( eo::log.getLevelSelected() >= eo::progress ) {...}
*/
eo::Levels getLevelSelected() const { return _selectedLevel; }
inline eo::Levels getLevelSelected() const { return _selectedLevel; }
/*! Returns the current level of the context
* the one given when you output message with the logger
*/
eo::Levels getLevelContext() const { return _contextLevel; }
inline eo::Levels getLevelContext() const { return _contextLevel; }
protected:
void addLevel(std::string name, eo::Levels level);
void addLevel(std::string name, eo::Levels level);
private:
void _createParameters( eoParser& );
private:
/**
* outbuf
* this class inherits from std::streambuf which is used by eoLogger to write the buffer in an output stream
*/
class outbuf : public std::streambuf
class outbuf : public std::streambuf
{
public:
outbuf(const int& fd,
const eo::Levels& contexlvl,
const eo::Levels& selectedlvl);
outbuf(const int& fd, const eo::Levels& contexlvl, const eo::Levels& selectedlvl);
protected:
virtual int overflow(int_type c);
virtual int overflow(int_type c);
private:
const int& _fd;
const eo::Levels& _contextLevel;
const eo::Levels& _selectedLevel;
const int& _fd;
const eo::Levels& _contextLevel;
const eo::Levels& _selectedLevel;
};
private:
/**
* MapLevel is the type used by the map member _levels.
*/
typedef std::map<std::string, eo::Levels> MapLevel;
typedef std::map<std::string, eo::Levels> MapLevel;
public:
/**
* operator<< used there to set a verbose mode.
*/
friend eoLogger& operator<<(eoLogger&, const eo::Levels);
friend eoLogger& operator<<(eoLogger&, const eo::Levels);
/**
* operator<< used there to set a filename through the class file.
*/
friend eoLogger& operator<<(eoLogger&, eo::file);
friend eoLogger& operator<<(eoLogger&, eo::file);
/**
* operator<< used there to set a verbose level through the class setlevel.
*/
friend eoLogger& operator<<(eoLogger&, eo::setlevel);
friend eoLogger& operator<<(eoLogger&, eo::setlevel);
/**
* operator<< used there to be able to use std::cout to say that we wish to redirect back the buffer to a standard output.
*/
friend eoLogger& operator<<(eoLogger&, std::ostream&);
friend eoLogger& operator<<(eoLogger&, std::ostream&);
private:
friend void make_verbose(eoParser&);
eoValueParam<std::string> _verbose;
eoValueParam<bool> _printVerboseLevels;
eoValueParam<std::string> _output;
/**
* _selectedLevel is the member storing verbose level setted by the user thanks to operator()
*/
eo::Levels _selectedLevel;
eo::Levels _contextLevel;
eo::Levels _selectedLevel;
eo::Levels _contextLevel;
/**
* _fd in storing the file descriptor at this place we can disable easily the buffer in
* changing the value at -1. It is used by operator <<.
*/
int _fd;
int _fd;
/**
* _obuf std::ostream mandates to use a buffer. _obuf is a outbuf inheriting of std::streambuf.
*/
outbuf _obuf;
outbuf _obuf;
/**
* _levels contains all the existing level order by position
*/
MapLevel _levels;
MapLevel _levels;
/**
* _levelsOrder is just a list to keep the order of levels
*/
std::vector<std::string> _sortedLevels;
std::vector<std::string> _sortedLevels;
/**
* _standard_io_streams
*/
std::map< std::ostream*, int > _standard_io_streams;
std::map< std::ostream*, int > _standard_io_streams;
};
/** @example t-eoLogger.cpp
*/
namespace eo
void make_verbose(eoParser&);
namespace eo
{
/**
* log is an external global variable defined to easily use a same way than std::cout to write a log.
*/
extern eoLogger log;
extern eoLogger log;
}
/** @} */
#endif // !eoLogger_h

View file

@ -1,80 +0,0 @@
/*
(c) Thales group, 2010
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; version 2 of the license.
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
Contact: http://eodev.sourceforge.net
Authors:
Johann Dreo <johann.dreo@thalesgroup.com>
Caner Candan <caner.candan@thalesgroup.com>
*/
#include "eoParserLogger.h"
eoParserLogger::eoParserLogger(unsigned _argc, char** _argv,
std::string _programDescription /*= ""*/
,
std::string _lFileParamName /*= "param-file"*/,
char _shortHand /*= 'p'*/)
: eoParser(_argc, _argv, _programDescription, _lFileParamName, _shortHand),
_verbose("quiet", "verbose", "Set the verbose level", 'v'),
_printVerboseLevels(false, "print-verbose-levels", "Print verbose levels", 'l'),
_output("", "output", "Redirect a standard output to a file", 'o')
{
//------------------------------------------------------------------
// we are saying to eoParser to create the parameters created above.
//------------------------------------------------------------------
processParam(_verbose);
processParam(_printVerboseLevels);
processParam(_output);
//------------------------------------------------------------------
//------------------------------------------------------------------
// we're gonna redirect the log to the given filename if -o is used.
//------------------------------------------------------------------
if ( ! _output.value().empty() )
{
eo::log << eo::file( _output.value() );
}
//------------------------------------------------------------------
//------------------------------------------------------------------
// // we're gonna print the list of levels if -l parameter is used.
//------------------------------------------------------------------
if ( _printVerboseLevels.value() )
{
eo::log.printLevels();
}
//------------------------------------------------------------------
}
eoParserLogger::~eoParserLogger()
{}
//! make_verbose gets level of verbose and sets it in eoLogger
void make_verbose(eoParserLogger& _parser)
{
eo::log << eo::setlevel(_parser._verbose.value());
}

View file

@ -1,62 +1,36 @@
/*
// -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
/*
(c) Thales group, 2010
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; version 2 of the license.
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;
version 2 of the License.
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.
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
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
Contact: http://eodev.sourceforge.net
Authors:
Johann Dréo <johann.dreo@thalesgroup.com>
Caner Candan <caner.candan@thalesgroup.com>
Caner Candan <caner.candan@thalesgroup.com>
*/
#ifndef EO_PARSER_LOGGER_H
#define EO_PARSER_LOGGER_H
#include "eoParser.h"
#include "eoLogger.h"
/**
* A parser that use the advanced logging system (@see eoLogger)
*
* @ingroup Parameters
* @ingroup Logging
*/
class eoParserLogger : public eoParser
{
public:
eoParserLogger(unsigned _argc, char** _argv,
std::string _programDescription = "",
std::string _lFileParamName = "param-file",
char _shortHand = 'p');
~eoParserLogger();
#warning "[eoParserLogger] is deprecated"
private:
friend void make_verbose(eoParserLogger&);
eoValueParam<std::string> _verbose;
eoValueParam<bool> _printVerboseLevels;
eoValueParam<std::string> _output;
};
void make_verbose(eoParserLogger&);
typedef eoParser eoParserLogger;
#endif // !EO_PARSER_LOGGER_H
// Local Variables:
// coding: iso-8859-1
// mode: C++
// c-file-offsets: ((c . 0))
// c-file-style: "Stroustrup"
// fill-column: 80
// End:

View file

@ -1,30 +0,0 @@
*.o
*.csv
*.sav
*.status
.deps
Makefile
Makefile.in
t-eo
t-eobin
t-eobreeder
t-eofitness
t-eoinclusion
t-eoinsertion
t-eolottery
t-eoproblem
t-eogeneration
t-eoNonUniform
t-eo2dVector
t-eoEasyEA
t-eoUniform
t-eoRandom
t-eoCheckpointing
t-eoVector
t-eoAtomOps
t-selectOne
t-eoStateAndParser
t-eoGOpSel
t-eoExternalEO
t-eoESFull
t-eoSymreg

View file

@ -2,17 +2,13 @@
// t-eoLogger.cpp
//-----------------------------------------------------------------------------
#include <iostream>
#include <utils/eoLogger.h>
#include <utils/eoParserLogger.h>
#include <eo>
//-----------------------------------------------------------------------------
int main(int ac, char** av)
int main(int ac, char** av)
{
eoParserLogger parser(ac, av);
eoParser parser(ac, av);
if (parser.userNeedsHelp())
{

View file

@ -32,9 +32,6 @@ Caner Candan <caner.candan@thalesgroup.com>
#include <sstream>
#include <climits>
#include <utils/eoLogger.h>
#include <utils/eoParserLogger.h>
#include <eo>
#include <es/make_real.h>
@ -114,7 +111,7 @@ void measure( size_t p,
int main(int ac, char** av)
{
eoParserLogger parser(ac, av);
eoParser parser(ac, av);
unsigned int popMin = parser.getORcreateParam((unsigned int)1, "popMin", "Population Min", 'p', "Evolution Engine").value();
unsigned int popStep = parser.getORcreateParam((unsigned int)1, "popStep", "Population Step", 0, "Evolution Engine").value();

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,6 +0,0 @@
Makefile.in
.deps
FirstBitGA
Makefile
exercise1.3
FirstRealGA

View file

@ -1,6 +0,0 @@
Makefile.in
.deps
FirstBitEA
FirstRealEA
exercise2.3
Makefile

View file

@ -1,3 +0,0 @@
Makefile.in
.deps
Makefile

View file

@ -1,3 +0,0 @@
Makefile.in
.deps
Makefile

View file

@ -1,3 +0,0 @@
Makefile.in
.deps
Makefile

View file

@ -1 +0,0 @@
Makefile.in

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -1,2 +0,0 @@
Makefile.in
Makefile

View file

@ -138,7 +138,9 @@
<p>EO is <em>a template-based, ANSI-C++ evolutionary computation library</em> which helps you to write your own stochastic optimization algorithms insanely fast.</p>
<!--
<div style="font-size:1.5em;color:red;border:thin solid red; background-color:#fee;margin:1em;padding:2em;text-align:center;">We have lost all the mailing-list subscriptions in a crash, please subscribe again on the <a href="https://lists.sourceforge.net/lists/listinfo/eodev-main">eodev-main subscription page</a>.</div>
-->
<p>Evolutionary algorithms forms a family of algorithms inspired by the theory of evolution, that solve various problems.
They evolve a set of solutions to a given problem, in order to produce the best results.
@ -175,6 +177,9 @@
<p>If you need immediate support or have any question, you can join us on the official chatroom. Just go on our <a href="http://chat.jabberfr.org/muckl_int/index.php?room=eo">webchat interface</a> and enter your nick. If you already have an XMPP account (Jabber or Google Talk, for example), you can directly connect to the <a href="xmpp:eo@chat.jabberfr.org">eo@chat.jabberfr.org</a> MUC with your favorite client.</p>
<div style="font-size:1.5em;color:red;border:thin solid blue; background-color:#eef;margin:1em;padding:0.5em;text-align:center;-moz-border-radius:1em;"><a href="http://sourceforge.net/projects/eodev/files/">Download</a></div>
<h1><a name="Features"></a>Features <a href="#Plan"></a></h1>
<h2><a name="Component-based"></a>Component-based framework</h2>
@ -184,7 +189,6 @@
<p>If your problem is a bit more exotic, you will have to code a class that represents how your <em>individuals</em> (a solution to your problem) are represented, and perhaps some <em>variations operators</em>, but most of the other operators (selection, replacement, stopping criteria, command-line interface, etc.) are already available in EO.</p>
<p><img src="Evolutionary_algorithm.png" title="A typical Evolutionary Algorithm, as seen from the EO point of vue Johann Dréo CC-BY-SA" /></p>
<h2><a name="Main-Features"></a>Main Features</h2>
<!-- <img src="http://upload.wikimedia.org/wikipedia/en/timeline/3f507249a36a4a38020e7fc0a5f448df.png" title="Metaheuristics that can be implemented with EO and ParadisEO, ordered by date of invention Johann Dréo/Wikipédia CC-BY-SA" style="float:right;" /> --> <!-- http://en.wikipedia.org/wiki/Metaheuristic -->