diff --git a/trunk/paradiseo-moeo/doc/moeo.doxyfile.cmake b/trunk/paradiseo-moeo/doc/moeo.doxyfile.cmake index 8f986de85..f6f48a1cd 100644 --- a/trunk/paradiseo-moeo/doc/moeo.doxyfile.cmake +++ b/trunk/paradiseo-moeo/doc/moeo.doxyfile.cmake @@ -1,4 +1,4 @@ -# Doxyfile 1.5.3 +# Doxyfile 1.5.8 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -14,11 +14,11 @@ # Project related configuration options #--------------------------------------------------------------------------- -# This tag specifies the encoding used for all characters in the config file that -# follow. The default is UTF-8 which is also the encoding used for all text before -# the first occurrence of this tag. Doxygen uses libiconv (or the iconv built into -# libc) for the transcoding. See http://www.gnu.org/software/libiconv for the list of -# possible encodings. +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. DOXYFILE_ENCODING = UTF-8 @@ -54,10 +54,11 @@ CREATE_SUBDIRS = NO # information to generate all constant output in the proper language. # The default language is English, other supported languages are: # Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, -# Croatian, Czech, Danish, Dutch, Finnish, French, German, Greek, Hungarian, -# Italian, Japanese, Japanese-en (Japanese with English messages), Korean, -# Korean-en, Lithuanian, Norwegian, Polish, Portuguese, Romanian, Russian, -# Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian. +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, +# Spanish, Swedish, and Ukrainian. OUTPUT_LANGUAGE = English @@ -164,13 +165,6 @@ QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO -# If the DETAILS_AT_TOP tag is set to YES then Doxygen -# will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member -# documentation. - -DETAILS_AT_TOP = NO - # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented # member inherits the documentation from any documented member that it # re-implements. @@ -205,14 +199,37 @@ ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java -# sources only. Doxygen will then generate output that is more tailored for Java. -# For instance, namespaces will be presented as packages, qualified scopes -# will look different, etc. +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO -# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want to -# include (a tag file for) the STL sources as input, then you should +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should # set this tag to YES in order to let doxygen match functions declarations and # definitions whose arguments contain STL classes (e.g. func(std::string); v.s. # func(std::string) {}). This also make the inheritance and collaboration @@ -220,11 +237,26 @@ OPTIMIZE_OUTPUT_JAVA = NO BUILTIN_STL_SUPPORT = NO -# If you use Microsoft's C++/CLI language, you should set this option to YES to +# If you use Microsoft's C++/CLI language, you should set this option to YES to # enable parsing support. CPP_CLI_SUPPORT = NO +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + # If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC # tag is set to YES, then doxygen will reuse the documentation of the first # member in the group (if any) for the other members of the group. By default @@ -240,6 +272,32 @@ DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -274,10 +332,11 @@ EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO -# If this flag is set to YES, the members of anonymous namespaces will be extracted -# and appear in the documentation as a namespace called 'anonymous_namespace{file}', -# where file will be replaced with the base name of the file that contains the anonymous -# namespace. By default anonymous namespace are hidden. +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. EXTRACT_ANON_NSPACES = NO @@ -356,11 +415,17 @@ SORT_MEMBER_DOCS = NO SORT_BRIEF_DOCS = NO +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + # If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be # sorted by fully-qualified names, including namespaces. If set to # NO (the default), the class list will be sorted only by class name, # not including the namespace part. -# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. # Note: This option applies only to the class list, not to the # alphabetical list. @@ -417,9 +482,22 @@ SHOW_USED_FILES = YES SHOW_DIRECTORIES = NO +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + # The FILE_VERSION_FILTER tag can be used to specify a program or script that -# doxygen should invoke to get the current version for each file (typically from the -# version control system). Doxygen will invoke the program by executing (via +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via # popen()) the command , where is the value of # the FILE_VERSION_FILTER tag, and is the name of an input file # provided by doxygen. Whatever the program writes to standard output @@ -427,6 +505,15 @@ SHOW_DIRECTORIES = NO FILE_VERSION_FILTER = +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- @@ -489,10 +576,11 @@ WARN_LOGFILE = INPUT = @CMAKE_SOURCE_DIR@ -# This tag can be used to specify the character encoding of the source files that -# doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default -# input encoding. Doxygen uses libiconv (or the iconv built into libc) for the transcoding. -# See http://www.gnu.org/software/libiconv for the list of possible encodings. +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. INPUT_ENCODING = UTF-8 @@ -501,7 +589,7 @@ INPUT_ENCODING = UTF-8 # and *.h) to filter out the source-files in the directories. If left # blank the following patterns are tested: # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx -# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 FILE_PATTERNS = *.cpp \ *.h \ @@ -535,9 +623,10 @@ EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names -# (namespaces, classes, functions, etc.) that should be excluded from the output. -# The symbol name can be a fully qualified name, a word, or if the wildcard * is used, -# a substring. Examples: ANamespace, AClass, AClass::ANamespace, ANamespace::*Test +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test EXCLUDE_SYMBOLS = @@ -572,14 +661,17 @@ IMAGE_PATH = # by executing (via popen()) the command , where # is the value of the INPUT_FILTER tag, and is the name of an # input file. Doxygen will then use the output that the filter program writes -# to standard output. If FILTER_PATTERNS is specified, this tag will be +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be # ignored. INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern -# basis. Doxygen will compare the file name with each pattern and apply the -# filter if there is a match. The filters are a list of the form: +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: # pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further # info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER # is applied to all files. @@ -599,9 +691,7 @@ FILTER_SOURCE_FILES = NO # If the SOURCE_BROWSER tag is set to YES then a list of source files will # be generated. Documented entities will be cross-referenced with these sources. # Note: To get rid of all source code in the generated output, make sure also -# VERBATIM_HEADERS is set to NO. If you have enabled CALL_GRAPH or CALLER_GRAPH -# then you must also enable this option. If you don't then doxygen will produce -# a warning and turn it on anyway +# VERBATIM_HEADERS is set to NO. SOURCE_BROWSER = YES @@ -616,22 +706,23 @@ INLINE_SOURCES = NO STRIP_CODE_COMMENTS = YES -# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# If the REFERENCED_BY_RELATION tag is set to YES # then for each documented function all documented # functions referencing it will be listed. REFERENCED_BY_RELATION = YES -# If the REFERENCES_RELATION tag is set to YES (the default) +# If the REFERENCES_RELATION tag is set to YES # then for each documented function all documented entities # called/used by that function will be listed. REFERENCES_RELATION = YES -# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) -# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from -# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will -# link to the source code. Otherwise they will link to the documentstion. +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. REFERENCES_LINK_SOURCE = YES @@ -720,13 +811,6 @@ HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES -# If the GENERATE_HTMLHELP tag is set to YES, additional index files -# will be generated that can be used as input for tools like the -# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) -# of the generated HTML documentation. - -GENERATE_HTMLHELP = NO - # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML # documentation will contain sections that can be hidden and shown after the # page has loaded. For this to work a browser that supports @@ -735,6 +819,39 @@ GENERATE_HTMLHELP = NO HTML_DYNAMIC_SECTIONS = NO +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can # be used to specify the file name of the resulting .chm file. You # can add a path in front of the file if the result should not be @@ -755,6 +872,12 @@ HHC_LOCATION = GENERATE_CHI = NO +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag # controls whether a binary table of contents is generated (YES) or a # normal table of contents (NO) in the .chm file. @@ -766,6 +889,55 @@ BINARY_TOC = NO TOC_EXPAND = NO +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# Qt Help Project / Custom Filters. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# Qt Help Project / Filter Attributes. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + # The DISABLE_INDEX tag can be used to turn on/off the condensed index at # top of each HTML page. The value NO (the default) enables the index and # the value YES disables it. @@ -777,12 +949,20 @@ DISABLE_INDEX = NO ENUM_VALUES_PER_LINE = 4 -# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be -# generated containing a tree-like index structure (just like the one that +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to FRAME, a side panel will be generated +# containing a tree-like index structure (just like the one that # is generated for HTML Help). For this to work a browser that supports # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are -# probably better off using the HTML help feature. +# probably better off using the HTML help feature. Other possible values +# for this tag are: HIERARCHIES, which will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list; +# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which +# disables this behavior completely. For backwards compatibility with previous +# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE +# respectively. GENERATE_TREEVIEW = YES @@ -792,6 +972,14 @@ GENERATE_TREEVIEW = YES TREEVIEW_WIDTH = 250 +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- @@ -1004,8 +1192,10 @@ GENERATE_PERLMOD = NO PERLMOD_LATEX = NO # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be -# nicely formatted so it can be parsed by a human reader. This is useful -# if you want to understand what is going on. On the other hand, if this +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this # tag is set to NO the size of the Perl module output will be much smaller # and Perl will parse it just the same. @@ -1092,14 +1282,16 @@ SKIP_FUNCTION_MACROS = YES # Optionally an initial location of the external documentation # can be added for each tagfile. The format of a tag file without # this location is as follows: -# TAGFILES = file1 file2 ... +# +# TAGFILES = file1 file2 ... # Adding location for the tag files is done as follows: -# TAGFILES = file1=loc1 "file2 = loc2" ... +# +# TAGFILES = file1=loc1 "file2 = loc2" ... # where "loc1" and "loc2" can be relative or absolute paths or # URLs. If a location is present for each tag, the installdox tool -# does not have to be run to correct the links. -# Note that each tag file must have a unique name -# (where the name does NOT include the path) +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) # If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. @@ -1141,10 +1333,11 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES # You can define message sequence charts within doxygen comments using the \msc -# command. Doxygen will then run the mscgen tool (see http://www.mcternan.me.uk/mscgen/) to -# produce the chart and insert it in the documentation. The MSCGEN_PATH tag allows you to -# specify the directory where the mscgen tool resides. If left empty the tool is assumed to -# be found in the default search path. +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. MSCGEN_PATH = @@ -1161,6 +1354,29 @@ HIDE_UNDOC_RELATIONS = YES HAVE_DOT = NO +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen # will generate a graph for each documented class showing the direct and # indirect inheritance relations. Setting this tag to YES will force the @@ -1205,19 +1421,19 @@ INCLUDE_GRAPH = YES INCLUDED_BY_GRAPH = YES -# If the CALL_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a call dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable call graphs for selected -# functions only using the \callgraph command. +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. CALL_GRAPH = NO -# If the CALLER_GRAPH, SOURCE_BROWSER and HAVE_DOT tags are set to YES then doxygen will -# generate a caller dependency graph for every global function or class method. -# Note that enabling this option will significantly increase the time of a run. -# So in most cases it will be better to enable caller graphs for selected -# functions only using the \callergraph command. +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. CALLER_GRAPH = NO @@ -1228,13 +1444,13 @@ GRAPHICAL_HIERARCHY = YES # If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES # then doxygen will show the dependencies a directory has on other directories -# in a graphical way. The dependency relations are determined by the #include +# in a graphical way. The dependency relations are determined by the #include # relations between the files in the directories. DIRECTORY_GRAPH = YES # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images -# generated by dot. Possible values are png, jpg, or gif +# generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. DOT_IMAGE_FORMAT = png @@ -1250,12 +1466,12 @@ DOT_PATH = DOTFILE_DIRS = -# The MAX_DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of # nodes that will be shown in the graph. If the number of nodes in a graph # becomes larger than this value, doxygen will truncate the graph, which is -# visualized by representing a node as a red box. Note that doxygen if the number -# of direct children of the root node in a graph is already larger than -# MAX_DOT_GRAPH_NOTES then the graph will not be shown at all. Also note +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note # that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. DOT_GRAPH_MAX_NODES = 50 @@ -1271,10 +1487,10 @@ DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 0 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent -# background. This is disabled by default, which results in a white background. -# Warning: Depending on the platform used, enabling this option may lead to -# badly anti-aliased labels on the edges of a graph (i.e. they become hard to -# read). +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). DOT_TRANSPARENT = NO @@ -1298,7 +1514,7 @@ GENERATE_LEGEND = YES DOT_CLEANUP = YES #--------------------------------------------------------------------------- -# Configuration::additions related to the search engine +# Options related to the search engine #--------------------------------------------------------------------------- # The SEARCHENGINE tag specifies whether or not a search engine should be diff --git a/trunk/paradiseo-moeo/src/do/make_ls_moeo.h b/trunk/paradiseo-moeo/src/do/make_ls_moeo.h deleted file mode 100755 index 4ac3e58f3..000000000 --- a/trunk/paradiseo-moeo/src/do/make_ls_moeo.h +++ /dev/null @@ -1,147 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* Arnaud Liefooghe -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MAKE_LS_MOEO_H_ -#define MAKE_LS_MOEO_H_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/** - * This functions allows to build a moeoLS from the parser - * @param _parser the parser - * @param _state to store allocated objects - * @param _eval the funtions evaluator - * @param _moveIncrEval the incremental evaluation - * @param _continue the stopping crietria - * @param _op the variation operators - * @param _opInit the initilization operator - * @param _moveInit the move initializer - * @param _nextMove the move incrementor - * @param _archive the archive of non-dominated solutions - */ -template < class MOEOT, class Move > -moeoLS < MOEOT, eoPop & > & do_make_ls_moeo ( - eoParser & _parser, - eoState & _state, - eoEvalFunc < MOEOT > & _eval, - moeoMoveIncrEval < Move > & _moveIncrEval, - eoContinue < MOEOT > & _continue, - eoMonOp < MOEOT > & _op, - eoMonOp < MOEOT > & _opInit, - moMoveInit < Move > & _moveInit, - moNextMove < Move > & _nextMove, - moeoArchive < MOEOT > & _archive -) -{ - /* the objective vector type */ - typedef typename MOEOT::ObjectiveVector ObjectiveVector; - /* the fitness assignment strategy */ - std::string & fitnessParam = _parser.getORcreateParam(std::string("IndicatorBased"), "fitness", - "Fitness assignment strategy parameter: IndicatorBased...", 'F', - "Evolution Engine").value(); - std::string & indicatorParam = _parser.getORcreateParam(std::string("Epsilon"), "indicator", - "Binary indicator to use with the IndicatorBased assignment: Epsilon, Hypervolume", 'i', - "Evolution Engine").value(); - double rho = _parser.getORcreateParam(1.1, "rho", "reference point for the hypervolume indicator", - 'r', "Evolution Engine").value(); - double kappa = _parser.getORcreateParam(0.05, "kappa", "Scaling factor kappa for IndicatorBased", - 'k', "Evolution Engine").value(); - moeoBinaryIndicatorBasedFitnessAssignment < MOEOT > * fitnessAssignment; - if (fitnessParam == std::string("IndicatorBased")) - { - // metric - moeoNormalizedSolutionVsSolutionBinaryMetric < ObjectiveVector, double > *metric; - if (indicatorParam == std::string("Epsilon")) - { - metric = new moeoAdditiveEpsilonBinaryMetric < ObjectiveVector >; - } - else if (indicatorParam == std::string("Hypervolume")) - { - metric = new moeoHypervolumeBinaryMetric < ObjectiveVector > (rho); - } - else - { - std::string stmp = std::string("Invalid binary quality indicator: ") + indicatorParam; - throw std::runtime_error(stmp.c_str()); - } - fitnessAssignment = new moeoExpBinaryIndicatorBasedFitnessAssignment < MOEOT> (*metric, kappa); - } - else - { - std::string stmp = std::string("Invalid fitness assignment strategy: ") + fitnessParam; - throw std::runtime_error(stmp.c_str()); - } - _state.storeFunctor(fitnessAssignment); - // number of iterations - unsigned int n = _parser.getORcreateParam(1, "n", "Number of iterations for population Initialization", 'n', "Evolution Engine").value(); - // LS - std::string & lsParam = _parser.getORcreateParam(std::string("I-IBMOLS"), "ls", - "Local Search: IBMOLS, I-IBMOLS (Iterated-IBMOLS)...", 'L', - "Evolution Engine").value(); - moeoLS < MOEOT, eoPop & > * ls; - if (lsParam == std::string("IBMOLS")) - { - ls = new moeoIBMOLS < MOEOT, Move > (_moveInit, _nextMove, _eval, _moveIncrEval, *fitnessAssignment, _continue); - ; - } - else if (lsParam == std::string("I-IBMOLS")) - { - ls = new moeoIteratedIBMOLS < MOEOT, Move > (_moveInit, _nextMove, _eval, _moveIncrEval, *fitnessAssignment, _continue, _op, _opInit, n); - } - else - { - std::string stmp = std::string("Invalid fitness assignment strategy: ") + fitnessParam; - throw std::runtime_error(stmp.c_str()); - } - _state.storeFunctor(ls); - // that's it ! - return *ls; -} - -#endif /*MAKE_LS_MOEO_H_*/ diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h index e351ddca7..b41465813 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoAggregationFitnessAssignment.h @@ -41,7 +41,7 @@ #include #include -#include +#include /* * Fitness assignment scheme which use weight foreach objectives diff --git a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h index c87ee3514..9096a1335 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/fitness/moeoConstraintFitnessAssignment.h @@ -40,7 +40,7 @@ #define MOEOCONSTRAINTFITNESSASSIGNMENT_H_ #include -#include +#include #include /* diff --git a/trunk/paradiseo-moeo/src/metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h b/trunk/paradiseo-moeo/src/metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h index 71813dcdd..c157c49fe 100644 --- a/trunk/paradiseo-moeo/src/metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h +++ b/trunk/paradiseo-moeo/src/metric/moeoVecVsVecAdditiveEpsilonBinaryMetric.h @@ -41,6 +41,7 @@ #include #include +#include /** * moeoVecVsVecAdditiveEpsilonBinaryMetric is the implementation of moeoVecVsVecEpsilonBinaryMetric whose calculate an additive epsilon indicator diff --git a/trunk/paradiseo-moeo/src/moeo b/trunk/paradiseo-moeo/src/moeo index 654d7bfeb..c629476fa 100644 --- a/trunk/paradiseo-moeo/src/moeo +++ b/trunk/paradiseo-moeo/src/moeo @@ -42,55 +42,44 @@ #include #include +#include #include #include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include #include -#include #include +#include +#include #include -#include +#include #include #include -#include -#include -#include -#include -#include - #include #include #include #include +#include #include #include -#include #include +#include #include #include #include #include #include -#include #include #include @@ -104,14 +93,10 @@ #include #include -#include #include #include #include -#include -#include -#include -#include +#include #include #include @@ -121,17 +106,14 @@ #include #include - -#include -#include -#include #include #include -#include #include +#include +#include #include -#include + #include #include #include @@ -145,47 +127,80 @@ #include #include #include +#include #include -#include #include -#include -#include -#include -#include -#include #include #include #include #include +#include #include #include #include #include #include #include -#include #include +#include #include -#include #include #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include +#include +#include #include #include #include #include #include #include -#include #include -#include -#include #include #include @@ -194,19 +209,7 @@ #include #include #include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - - #endif /*MOEO_*/ diff --git a/trunk/paradiseo-moeo/src/algo/moeoHC.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h similarity index 94% rename from trunk/paradiseo-moeo/src/algo/moeoHC.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h index 282f20c55..25cb7bce4 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoHC.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoHC.h @@ -36,10 +36,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef __moeoHC_h #define __moeoHC_h -#include -#include -#include -#include +#include +#include +#include +#include #include //! Hill Climbing (HC) /*! diff --git a/trunk/paradiseo-moeo/src/algo/moeoILS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h similarity index 96% rename from trunk/paradiseo-moeo/src/algo/moeoILS.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h index 6d80578c7..ff40b0a48 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoILS.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoILS.h @@ -37,19 +37,19 @@ Contact: paradiseo-help@lists.gforge.inria.fr #ifndef _moeoILS_h #define _moeoILS_h -#include #include - -#include -#include -#include -#include -#include -#include -#include -#include #include + +#include +#include +#include +#include +#include +#include +#include +#include + //! Iterated Local Search (ILS) /*! Class which describes the algorithm for a iterated local search. diff --git a/trunk/paradiseo-moeo/src/algo/moeoSA.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h similarity index 95% rename from trunk/paradiseo-moeo/src/algo/moeoSA.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h index f6c6da306..8449f75e9 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoSA.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSA.h @@ -38,10 +38,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #define __moeoSA_h #include -#include +#include #include -#include -#include +#include +#include #include //! Simulated annealing (SA) /*! diff --git a/trunk/paradiseo-moeo/src/algo/moeoSolAlgo.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSolAlgo.h similarity index 100% rename from trunk/paradiseo-moeo/src/algo/moeoSolAlgo.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoSolAlgo.h diff --git a/trunk/paradiseo-moeo/src/algo/moeoTS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h similarity index 96% rename from trunk/paradiseo-moeo/src/algo/moeoTS.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h index cbbfb30b6..e20ce230f 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoTS.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoTS.h @@ -39,9 +39,9 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include -#include -#include +#include +#include +#include //! Tabu Search (TS) /*! Generic algorithm that describes a tabu search. diff --git a/trunk/paradiseo-moeo/src/algo/moeoVFAS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h similarity index 65% rename from trunk/paradiseo-moeo/src/algo/moeoVFAS.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h index c0093ae70..429703f4c 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoVFAS.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVFAS.h @@ -40,14 +40,14 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include -#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //! Variable fitness assignment search (vfas) /*! Search using multiple fitness assignment to search solution to a multi objective problem @@ -61,38 +61,36 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > typedef typename M::EOType MOEOT; typedef typename MOEOT::ObjectiveVector ObjectiveVector; typedef typename MOEOT::Fitness Fitness; - /*! - constructor using a moAlgo and a vector of weight - take a base vector of weight, and modify it to relaunch the algo with a diferent fitness - use a selectOne to determine which moeot should be the base for the algo launch - use a eoPop to keep result from each iteration - @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. - @param _continue The stopping criterion. - @param _select a selector to choose on which moeot we use the algorithm - @param _weights a vector containing the base weights, which will be changed at each iteration. - @param _eval The evaluation function. - @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness) + /** + * constructor using a moAlgo and a vector of weight + * take a base vector of weight, and modify it to relaunch the algo with a diferent fitness + * use a selectOne to determine which moeot should be the base for the algo launch + * use a eoPop to keep result from each iteration + * @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. + * @param _continue The stopping criterion. + * @param _select a selector to choose on which moeot we use the algorithm + * @param _weights a vector containing the base weights, which will be changed at each iteration. + * @param _eval The evaluation function. + * @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness) */ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, std::vector &_weights, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy &_wstrat ): algo(_algorithm),cont(_continue), select(_select), weights(_weights),eval(_eval),refPoint(defaultRefPoint), wstrat(_wstrat), rstrat(defaultRstrat) {} - /*! - constructor using a moAlgo an ObjectiveVector and a vector of weight - take a base vector of weight, and modify it to relaunch the algo with a diferent fitness - use a selectOne to determine which moeot should be the base for the algo launch - use a eoPop to keep result from each iteration - - - @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. - @param _continue The stopping criterion. - @param _select a selector to choose on which moeot we use the algorithm - @param _weights a vector containing the base weights, which will be changed at each iteration. - @param _refPoint a reference point changed at each iteration - @param _eval The evaluation function. - @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness) - @param _rstrat the strategy to change the reference point + /** + * constructor using a moAlgo an ObjectiveVector and a vector of weight + * take a base vector of weight, and modify it to relaunch the algo with a diferent fitness + * use a selectOne to determine which moeot should be the base for the algo launch + * use a eoPop to keep result from each iteration + * @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. + * @param _continue The stopping criterion. + * @param _select a selector to choose on which moeot we use the algorithm + * @param _weights a vector containing the base weights, which will be changed at each iteration. + * @param _refPoint a reference point changed at each iteration + * @param _eval The evaluation function. + * @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness) + * @param _rstrat the strategy to change the reference point */ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, std::vector &_weights, ObjectiveVector &_refPoint, eoEvalFunc< MOEOT > &_eval , moeoVariableWeightStrategy &_wstrat , moeoVariableRefPointStrategy& _rstrat): @@ -100,12 +98,13 @@ class moeoVFAS:public moeoPopAlgo < typename M::EOType > {} /** - constructor without the weights - @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. - @param _continue The stopping criterion. - @param _select a selector to choose on which moeot we use the algorithm - @param _eval The evaluation function. - **/ + * constructor without the weights + * @param _algorithm The solution based heuristic to use. It should at least use the fitness value at some point. + * @param _continue The stopping criterion. + * @param _select a selector to choose on which moeot we use the algorithm + * @param _eval The evaluation function. + * @param _wstrat the strategy to change weights (should be constructed with the same weights as the fitness) + */ moeoVFAS (moeoSolAlgo & _algorithm, eoContinue & _continue,moeoSelectOne &_select, eoEvalFunc< MOEOT > &_eval, moeoVariableWeightStrategy &_wstrat): algo(_algorithm),cont(_continue), select(_select), weights(defaultWeights), eval(_eval), refPoint(defaultRefPoint), wstrat(defaultWstrat), rstrat(defaultRstrat) diff --git a/trunk/paradiseo-moeo/src/algo/moeoVNS.h b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h similarity index 94% rename from trunk/paradiseo-moeo/src/algo/moeoVNS.h rename to trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h index 09fe2cd56..9af0c265d 100644 --- a/trunk/paradiseo-moeo/src/algo/moeoVNS.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/algo/moeoVNS.h @@ -39,10 +39,10 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include -#include +#include #include -#include -#include +#include +#include //! Variable Neighbors Search (VNS) /*! Class which describes the algorithm for a Variable Neighbors Search. diff --git a/trunk/paradiseo-moeo/src/archive/moeoArchiveIndex.h b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoArchiveIndex.h similarity index 100% rename from trunk/paradiseo-moeo/src/archive/moeoArchiveIndex.h rename to trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoArchiveIndex.h diff --git a/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoIndexedArchive.h similarity index 98% rename from trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h rename to trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoIndexedArchive.h index 940941b3d..3e2c574dc 100755 --- a/trunk/paradiseo-moeo/src/archive/moeoIndexedArchive.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoIndexedArchive.h @@ -3,7 +3,7 @@ #include #include -#include +#include /** * Archive used for 2 dimension vectors which remove pareto dominated values diff --git a/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTree.h similarity index 99% rename from trunk/paradiseo-moeo/src/archive/moeoQuadTree.h rename to trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTree.h index b159a1c6d..b06a248d4 100755 --- a/trunk/paradiseo-moeo/src/archive/moeoQuadTree.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTree.h @@ -40,7 +40,7 @@ #define MOEOQUADTREE_H_ #include -#include +#include template < class ObjectiveVector > class QuadTreeNode{ public: diff --git a/trunk/paradiseo-moeo/src/archive/moeoQuadTreeArchive.h b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTreeArchive.h similarity index 90% rename from trunk/paradiseo-moeo/src/archive/moeoQuadTreeArchive.h rename to trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTreeArchive.h index e7317db9e..9f95224bb 100644 --- a/trunk/paradiseo-moeo/src/archive/moeoQuadTreeArchive.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuadTreeArchive.h @@ -69,12 +69,6 @@ public: typedef typename MOEOT::ObjectiveVector ObjectiveVector; - /** - * Ctor where you can choose your own moeoObjectiveVectorComparator - * @param _comparator the functor used to compare objective vectors - * @param _epsilon the vector contains epsilon values for each objective - * @param _replace boolean which determine if a solution with the same objectiveVector than another one, can replace it or not - */ moeoQuadTreeArchive() : moeoArchive < MOEOT >(){} /** diff --git a/trunk/paradiseo-moeo/src/archive/moeoQuickUnboundedArchiveIndex.h b/trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuickUnboundedArchiveIndex.h similarity index 100% rename from trunk/paradiseo-moeo/src/archive/moeoQuickUnboundedArchiveIndex.h rename to trunk/paradiseo-moeo/src/scalarStuffs/archive/moeoQuickUnboundedArchiveIndex.h diff --git a/trunk/paradiseo-moeo/src/distance/moeoAchievementScalarizingFunctionDistance.h b/trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h similarity index 100% rename from trunk/paradiseo-moeo/src/distance/moeoAchievementScalarizingFunctionDistance.h rename to trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAchievementScalarizingFunctionDistance.h diff --git a/trunk/paradiseo-moeo/src/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h b/trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h similarity index 100% rename from trunk/paradiseo-moeo/src/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h rename to trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedAchievementScalarizingFunctionDistance.h diff --git a/trunk/paradiseo-moeo/src/distance/moeoAugmentedWeightedChebychevDistance.h b/trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedWeightedChebychevDistance.h similarity index 100% rename from trunk/paradiseo-moeo/src/distance/moeoAugmentedWeightedChebychevDistance.h rename to trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoAugmentedWeightedChebychevDistance.h diff --git a/trunk/paradiseo-moeo/src/distance/moeoWeightedChebychevDistance.h b/trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoWeightedChebychevDistance.h similarity index 100% rename from trunk/paradiseo-moeo/src/distance/moeoWeightedChebychevDistance.h rename to trunk/paradiseo-moeo/src/scalarStuffs/distance/moeoWeightedChebychevDistance.h diff --git a/trunk/paradiseo-moeo/src/explorer/moeoHCMoveLoopExpl.h b/trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoHCMoveLoopExpl.h similarity index 98% rename from trunk/paradiseo-moeo/src/explorer/moeoHCMoveLoopExpl.h rename to trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoHCMoveLoopExpl.h index ae3c8f820..79f1b8003 100755 --- a/trunk/paradiseo-moeo/src/explorer/moeoHCMoveLoopExpl.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoHCMoveLoopExpl.h @@ -42,7 +42,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr #include #include #include -#include +#include /** move explorer for multiobjectives solutions */ diff --git a/trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h b/trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoTSMoveLoopExpl.h similarity index 100% rename from trunk/paradiseo-moeo/src/explorer/moeoTSMoveLoopExpl.h rename to trunk/paradiseo-moeo/src/scalarStuffs/explorer/moeoTSMoveLoopExpl.h diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAchievementFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementFitnessAssignment.h similarity index 100% rename from trunk/paradiseo-moeo/src/fitness/moeoAchievementFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementFitnessAssignment.h diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h similarity index 97% rename from trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h index 185d625a0..1e6f91a5a 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAchievementScalarizingFunctionMetricFitnessAssignment.h @@ -40,8 +40,8 @@ #define MOEOASFAFITNESSASSIGNMENT_H_ #include -#include -#include +#include +#include #include #include diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h similarity index 97% rename from trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h index ff654aa7f..647802a56 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedAchievementScalarizingFunctionMetricFitnessAssignment.h @@ -43,9 +43,9 @@ #include #include #include -#include +#include #include -#include +#include /* * Fitness assignment scheme which use a metric diff --git a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h similarity index 99% rename from trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h index 356ac2144..62038ef77 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoAugmentedWeightedChebychevMetricFitnessAssignment.h @@ -40,7 +40,7 @@ #define MOEOAUGCHEVMETRICFITNESSASSIGNMENT_H_ #include -#include +#include #include /* diff --git a/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h similarity index 98% rename from trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h index d316e6cc3..96dbee494 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoIncrEvalSingleObjectivizer.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoIncrEvalSingleObjectivizer.h @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include /** diff --git a/trunk/paradiseo-moeo/src/fitness/moeoMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h similarity index 98% rename from trunk/paradiseo-moeo/src/fitness/moeoMetricFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h index f5c3e5549..976fb7c34 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoMetricFitnessAssignment.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include /* diff --git a/trunk/paradiseo-moeo/src/fitness/moeoSingleObjectivization.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoSingleObjectivization.h similarity index 100% rename from trunk/paradiseo-moeo/src/fitness/moeoSingleObjectivization.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoSingleObjectivization.h diff --git a/trunk/paradiseo-moeo/src/fitness/moeoWeightedChebychevMetricFitnessAssignment.h b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h similarity index 97% rename from trunk/paradiseo-moeo/src/fitness/moeoWeightedChebychevMetricFitnessAssignment.h rename to trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h index 4d8dba309..d16bc53cc 100644 --- a/trunk/paradiseo-moeo/src/fitness/moeoWeightedChebychevMetricFitnessAssignment.h +++ b/trunk/paradiseo-moeo/src/scalarStuffs/fitness/moeoWeightedChebychevMetricFitnessAssignment.h @@ -43,9 +43,9 @@ #include #include #include -#include +#include #include -#include +#include /* * Fitness assignment scheme which use a metric diff --git a/trunk/paradiseo-moeo/src/utils/moeoAnytimeWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoAnytimeWeightStrategy.h deleted file mode 100755 index 5a86595db..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoAnytimeWeightStrategy.h +++ /dev/null @@ -1,101 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOANYTIMEWEIGHTSTRAT_H_ -#define MOEOANYTIMEWEIGHTSTRAT_H_ -#include -#include -#include -#include - -/** - * Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2. - * Can only be applied to 2 objectives vector problem - */ -template -class moeoAnytimeWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - */ - moeoAnytimeWeightStrategy():random(default_random),depth(0){} - - /** - * constructor with a given random generator, for algorithms wanting to keep the same generator for some reason - * @param _random an uniform random generator - */ - moeoAnytimeWeightStrategy(UF_random_generator &_random):random(_random), depth(0){} - - /** - * - * @param _weights the weights to change - * @param _moeot not used - */ - void operator()(std::vector& _weights, const MOEOT& _moeot){ - if (depth<2){ - if (depth==0) toTest.push_back(0.5); - _weights[0]=depth; - _weights[1]=1-_weights[0]; - depth++; - old1=0; - old2=1; - return; - } - if (!toTest.empty()){ - _weights[0]=toTest.front(); - _weights[1]=1-_weights[0]; - toTest.erase(toTest.begin()); - toTest.push_back((_weights[0]+old1)/2); - toTest.push_back((_weights[0]+old2)/2); - old2=old1; - old1=_weights[0]; - }else{ - std::cout<<"Error: Strange occurence in moeoAnytimeWeightStrategy "< &random; - UF_random_generator default_random; - int depth; - std::list toTest; -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoAugmentedQexploreWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoAugmentedQexploreWeightStrategy.h deleted file mode 100755 index 0d740a970..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoAugmentedQexploreWeightStrategy.h +++ /dev/null @@ -1,169 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOAUGMENTEDQEXPLWEIGHTSTRAT_H_ -#define MOEOAUGMENTEDQEXPLWEIGHTSTRAT_H_ -#include -#include -#include -#include - -/** - * Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2. - * Can only be applied to 2 objectives vector problem - */ -template -class moeoAugmentedQexploreWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - */ - moeoAugmentedQexploreWeightStrategy():depth(0),num(0),reset(true){ - nums.resize(1,0); - } - /** - * - * @param _weights the weights to change - * @param moeot a moeot, not used - */ - void operator()(std::vector &_weights,const MOEOT &moeot){ - int dim=moeot.objectiveVector().size(); - bool res=false; - int max=dim-1; - if (depth==0) do_reset(); - while (!res) { - res=translate(dim,_weights); - next_num(dim); - if (nums[0]>max){ - do_reset(); - } - } - } - - private: - - void next_num(int dim){ - int max=dim-1; - int idx=nums.size()-1; - if (depth==0){ - do_reset(); - }else{ - idx=nums.size()-1; - while(idx>0 && nums[idx]==max) idx--; - int to_assign=nums[idx]+1; - for (unsigned int i=idx;i &_weights){ - _weights.clear(); - _weights.resize(dim,0); - for (unsigned int i=0;i1 && _weights[nums[i]]==depth) { - return false; - } - } - - bool accept_pow=false; - bool accept_prim=false; - for (unsigned int i=0;i<_weights.size();i++){ - if (accept_pow || (_weights[i]!=1 && !is2pow(_weights[i]))) { - accept_pow=true; - } - if (accept_prim || (coprim(_weights[i],depth))) - accept_prim=true; - - _weights[i]=(_weights[i]+0.0)/(0.0+depth); - } - return accept_prim && accept_pow; - } - - void do_reset(){ - if (depth==0) depth=1; - else depth=depth*2; - nums.resize(depth); - for (unsigned int i=0;i nums; - int depth,num; - bool reset; - -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoDichoWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoDichoWeightStrategy.h deleted file mode 100644 index 703ee4925..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoDichoWeightStrategy.h +++ /dev/null @@ -1,153 +0,0 @@ -/* - * - * Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 - * (C) OPAC Team, LIFL, 2002-2007 - * - * Fran<-61><-89>ois Legillon - * - * This software is governed by the CeCILL license under French law and - * abiding by the rules of distribution of free software. You can use, - * modify and/ or redistribute the software under the terms of the CeCILL - * license as circulated by CEA, CNRS and INRIA at the following URL - * "http://www.cecill.info". - * - * As a counterpart to the access to the source code and rights to copy, - * modify and redistribute granted by the license, users are provided only - * with a limited warranty and the software's author, the holder of the - * economic rights, and the successive licensors have only limited liability. - * - * In this respect, the user's attention is drawn to the risks associated - * with loading, using, modifying and/or developing or reproducing the - * software by the user in light of its specific status of free software, - * that may mean that it is complicated to manipulate, and that also - * therefore means that it is reserved for developers and experienced - * professionals having in-depth computer knowledge. Users are therefore - * encouraged to load and test the software's suitability as regards their - * requirements in conditions enabling the security of their systems and/or - * data to be ensured and, more generally, to use and operate it in the - * same conditions as regards security. - * The fact that you are presently reading this means that you have had - * knowledge of the CeCILL license and that you accept its terms. - * - * ParadisEO WebSite : http://paradiseo.gforge.inria.fr - * Contact: paradiseo-help@lists.gforge.inria.fr - * - */ -//----------------------------------------------------------------------------- - -#ifndef MOEODICHOWEIGHTSTRAT_H_ -#define MOEODICHOWEIGHTSTRAT_H_ -#include -#include -#include -#include - -/** - * Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2. - * Can only be applied to 2 objectives vector problem - */ -template -class moeoDichoWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - */ - moeoDichoWeightStrategy():random(default_random),num(0){} - - /** - * constructor with a given random generator, for algorithms wanting to keep the same generator for some reason - * @param _random an uniform random generator - */ - moeoDichoWeightStrategy(UF_random_generator &_random):random(_random),num(0){} - - /** - * - * @param _weights the weights to change - * @param moeot a moeot, will be kept in an archive in order to calculate weights later - */ - void operator()(std::vector &_weights,const MOEOT &moeot){ - std::vector res; - ObjectiveVector tmp; - _weights.resize(moeot.objectiveVector().size()); - if (arch.size()<2){ - //archive too small, we generate starting weights to populate it - //if no better solution is provided, we will toggle between (0,1) and (1,0) - arch(moeot); - if (num==0){ - _weights[0]=0; - _weights[1]=1; - num++; - }else{ - _weights[1]=0; - _weights[0]=1; - num=0; - std::sort(arch.begin(),arch.end(),cmpParetoSort()); - it=arch.begin(); - } - return; - }else{ - if (it!=arch.end()){ - tmp=(*it).objectiveVector(); - it++; - if (it==arch.end()){ - //we were at the last elements, recurse to update the archive - operator()(_weights,moeot); - return; - } - toAdd.push_back(moeot); - res=normal(tmp,(*it).objectiveVector()); - _weights[0]=res[0]; - _weights[1]=res[1]; - }else{ - //we only add new elements to the archive once we have done an entire cycle on it, - //to prevent iterator breaking - //then we reset the iterator, and we recurse to start over - arch(toAdd); - toAdd.clear(); - std::sort(arch.begin(),arch.end(),cmpParetoSort()); - it=arch.begin(); - operator()(_weights,moeot); - return; - } - } - - } - - - - private: - typedef typename MOEOT::ObjectiveVector ObjectiveVector; - - std::vector normal(const ObjectiveVector &_obj1, const ObjectiveVector &_obj2){ - std::vector res; - double sum=0; - for (unsigned int i=0;i<_obj1.size();i++){ - if (_obj1[i]>_obj2[i]) - res.push_back(_obj1[i]-_obj2[i]); - else - res.push_back(_obj2[i]-_obj1[i]); - sum+=res[i]; - } - for (unsigned int i=0;i<_obj1.size();i++) res[i]=res[i]/sum; - return res; - } - struct cmpParetoSort - { - //since we apply it to a 2dimension pareto front, we can sort every objectiveVector - // following either objective without problem - bool operator()(const MOEOT & a,const MOEOT & b) const - { - return b.objectiveVector()[0] &random; - UF_random_generator default_random; - int num; - moeoUnboundedArchive arch; - eoPop toAdd; - typename eoPop::iterator it; -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h deleted file mode 100755 index bd3142cd2..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoDummyRefPointStrategy.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MOEODUMMYREFPOINT_H_ -#define MOEODUMMYREFPOINT_H_ - -/** - * dummy class for variable reference point strategies. do nothing - */ -template -class moeoDummyRefPointStrategy : public moeoVariableRefPointStrategy - { - public: - virtual void operator()(typename MOEOT::ObjectiveVector &_obj, const MOEOT &_moeo ){} - }; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h deleted file mode 100755 index 3b93dd077..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoDummyWeightStrategy.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MOEODUMMYWEIGHTSTRAT_H_ -#define MOEODUMMYWEIGHTSTRAT_H_ -#include - -/** - * Dummy variable weight strategy. Fill the weight with equal values - */ -template -class moeoDummyWeightStrategy: public moeoVariableWeightStrategy - { - public: - /** - * main function - * @param _weights the weights to change - * @param _moeot not used - */ - void operator()(std::vector &_weights,const MOEOT &_moeot){ - for (unsigned int i=0;i<_weights.size();i++){ - _weights[i]=(1.0/_weights.size()); - } - } - }; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoFixedTimeBothDirectionWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoFixedTimeBothDirectionWeightStrategy.h deleted file mode 100755 index 6b935cac5..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoFixedTimeBothDirectionWeightStrategy.h +++ /dev/null @@ -1,87 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOFTBDWSWEIGHTSTRAT_H_ -#define MOEOFTBDWSWEIGHTSTRAT_H_ -#include -#include -#include -#include - -/** - * Change all weights according to a "double strategy" pattern 2 to 1 then 1 to 2. - */ -template -class moeoFixedTimeBothDirectionWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - * @param _step how much we want the weight to change every iteration - */ - moeoFixedTimeBothDirectionWeightStrategy(double _step):step(_step),current(0),direction(false){} - /** - * - * @param _weights the weights to change - * @param moeot a moeot, not used - */ - void operator()(std::vector &_weights,const MOEOT &moeot){ - double res; - if (current==1){ - res=1; - current=0; - direction=!direction; - }else res=current; - if (current+step>1){ - current=1; - }else current+=step; - if (direction){ - _weights[0]=res; - _weights[1]=1-res; - }else{ - _weights[0]=1-res; - _weights[1]=res; - } - } - - private: - double step; - double current; - bool direction; -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoFixedTimeOneDirectionWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoFixedTimeOneDirectionWeightStrategy.h deleted file mode 100755 index e21c4535d..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoFixedTimeOneDirectionWeightStrategy.h +++ /dev/null @@ -1,80 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOFTODWSWEIGHTSTRAT_H_ -#define MOEOFTODWSWEIGHTSTRAT_H_ -#include -#include -#include -#include - -/** - * Change all weights according to a simple strategy by adding a step every generation - */ -template -class moeoFixedTimeOneDirectionWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - * @param _step how much we want the weight to change every iteration - */ - moeoFixedTimeOneDirectionWeightStrategy(double _step):step(_step),current(0){} - /** - * - * @param _weights the weights to change - * @param moeot a moeot, not used - */ - void operator()(std::vector &_weights,const MOEOT &moeot){ - double res; - if (current==1){ - res=1; - current=0; - }else res=current; - if (current+step>1){ - current=1; - }else current+=step; - _weights[0]=res; - _weights[1]=1-res; - } - - private: - double step; - double current; -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoQexploreWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoQexploreWeightStrategy.h deleted file mode 100755 index 7fbabe029..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoQexploreWeightStrategy.h +++ /dev/null @@ -1,114 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* - */ -//----------------------------------------------------------------------------- - -#ifndef MOEOQEXPLWEIGHTSTRAT_H_ -#define MOEOQEXPLWEIGHTSTRAT_H_ -#include -#include -#include -#include -//#include -/** - * Change all weights according to a pattern ressembling to a "double strategy" 2 to 1 then 1 to 2. - * Can only be applied to 2 objectives vector problem - */ -template -class moeoQexploreWeightStrategy: public moeoVariableWeightStrategy -{ - public: - /** - * default constructor - */ - moeoQexploreWeightStrategy():random(default_random),depth(0),num(0){} - - /** - * constructor with a given random generator, for algorithms wanting to keep the same generator for some reason - * @param _random an uniform random generator - */ - moeoQexploreWeightStrategy(UF_random_generator &_random):random(_random),depth(0),num(0){} - /** - * - * @param _weights the weights to change - * @param moeot a moeot, not used - */ - void operator()(std::vector &_weights,const MOEOT &moeot){ - if (depth==0){ - if (num==0){ - num++; - _weights[0]=0; - _weights[1]=1; - }else{ - num=1; - depth=1; - _weights[0]=1; - _weights[1]=0; - } - }else{ - while (num=depth){ - depth++; - num=1; - } - _weights[0]=(num+0.0)/depth; - _weights[1]=1-(num+0.0)/depth; - num++; - } - } - - - private: - - bool coprim(int a, int b){ - if (b==0){ - return a==1; - }else { - return coprim(b,a%b); - } - } - - void next_num(){ - - } - UF_random_generator &random; - UF_random_generator default_random; - int depth,num,idx; - std::list toTest; -}; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoRandWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoRandWeightStrategy.h deleted file mode 100755 index 3c2099a95..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoRandWeightStrategy.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MOEORANDWEIGHTSTRAT_H_ -#define MOEORANDWEIGHTSTRAT_H_ -#include - -/** - * Change all weights randomly. - */ -template -class moeoRandWeightStrategy: public moeoVariableWeightStrategy - { - public: - /** - * default constructor - */ - moeoRandWeightStrategy():random(default_random){} - - /** - * constructor with a given random generator, for algorithms wanting to keep the same generator for some reason - * @param _random an uniform random generator - */ - moeoRandWeightStrategy(UF_random_generator &_random):random(_random){} - - /** - * main function, fill the weight randomly - * @param _weights the weights to change - * @param _moeot not used - */ - void operator()(std::vector &_weights,const MOEOT &_moeot){ - double sum=0; - for (unsigned int i=0;i<_weights.size();i++){ - double rnd=random(100000); - sum+=rnd; - _weights[i]=rnd; - } - //we divide by the sum in order to keep the weight sum equal to 1 - for (unsigned int i=0;i<_weights.size();i++){ - _weights[i]=_weights[i]/sum; - } - } - - private: - UF_random_generator &random; - UF_random_generator default_random; - }; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoVariableRefPointStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoVariableRefPointStrategy.h deleted file mode 100755 index 1eb355d54..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoVariableRefPointStrategy.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MOEOVARREFPOINT_H_ -#define MOEOVARREFPOINT_H_ - -/** - * Abstract class for strategies for changing reference point, in a fitness assignment that use it. - */ -template -class moeoVariableRefPointStrategy - { - public: - virtual void operator()(typename MOEOT::ObjectiveVector &_obj,const MOEOT &_moeo )=0; - }; - -#endif diff --git a/trunk/paradiseo-moeo/src/utils/moeoVariableWeightStrategy.h b/trunk/paradiseo-moeo/src/utils/moeoVariableWeightStrategy.h deleted file mode 100755 index f6a2147b3..000000000 --- a/trunk/paradiseo-moeo/src/utils/moeoVariableWeightStrategy.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -* -* Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2007 -* (C) OPAC Team, LIFL, 2002-2007 -* -* François Legillon -* -* This software is governed by the CeCILL license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL -* license as circulated by CEA, CNRS and INRIA at the following URL -* "http://www.cecill.info". -* -* As a counterpart to the access to the source code and rights to copy, -* modify and redistribute granted by the license, users are provided only -* with a limited warranty and the software's author, the holder of the -* economic rights, and the successive licensors have only limited liability. -* -* In this respect, the user's attention is drawn to the risks associated -* with loading, using, modifying and/or developing or reproducing the -* software by the user in light of its specific status of free software, -* that may mean that it is complicated to manipulate, and that also -* therefore means that it is reserved for developers and experienced -* professionals having in-depth computer knowledge. Users are therefore -* encouraged to load and test the software's suitability as regards their -* requirements in conditions enabling the security of their systems and/or -* data to be ensured and, more generally, to use and operate it in the -* same conditions as regards security. -* The fact that you are presently reading this means that you have had -* knowledge of the CeCILL license and that you accept its terms. -* -* ParadisEO WebSite : http://paradiseo.gforge.inria.fr -* Contact: paradiseo-help@lists.gforge.inria.fr -* -*/ -//----------------------------------------------------------------------------- - -#ifndef MOEOVARWEIGHT_H_ -#define MOEOVARWEIGHT_H_ - -/** - * Abstract class for strategies for changing weight, in a aggregative fitness assignment. - */ -template -class moeoVariableWeightStrategy - { - public: - virtual void operator()(std::vector &_weights,const MOEOT &_moeo )=0; - }; - -#endif diff --git a/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp index 482edb158..16fafcab7 100755 --- a/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoASFAMetric.cpp @@ -42,7 +42,6 @@ #include #include #include -#include //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp index b8e019429..9ca8d2e67 100755 --- a/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoASFAOrMetric.cpp @@ -42,7 +42,7 @@ #include #include #include -#include + //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp b/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp index c81e5ec1c..93990e1c5 100755 --- a/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoAggregationFitnessAssignment.cpp @@ -42,7 +42,7 @@ #include #include #include -#include + //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp index ec1be5f96..5037847ea 100755 --- a/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoChebyshevMetric.cpp @@ -42,7 +42,6 @@ #include #include #include -#include //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp b/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp index 30afece5c..9d82d18da 100755 --- a/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoChebyshevOrientedMetric.cpp @@ -42,7 +42,6 @@ #include #include #include -#include //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp b/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp index f6f063d44..8a0e0a573 100755 --- a/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoConstraintFitnessAssignment.cpp @@ -42,7 +42,6 @@ #include #include #include -#include //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoQuadTreeIndex.cpp b/trunk/paradiseo-moeo/test/t-moeoQuadTreeIndex.cpp index 0febcec13..65c9b1ccc 100755 --- a/trunk/paradiseo-moeo/test/t-moeoQuadTreeIndex.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoQuadTreeIndex.cpp @@ -4,8 +4,7 @@ #include #include -#include -#include + //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits diff --git a/trunk/paradiseo-moeo/test/t-moeoQuickUnboundedArchiveIndex.cpp b/trunk/paradiseo-moeo/test/t-moeoQuickUnboundedArchiveIndex.cpp index 7f57b3948..ea0d99fe8 100755 --- a/trunk/paradiseo-moeo/test/t-moeoQuickUnboundedArchiveIndex.cpp +++ b/trunk/paradiseo-moeo/test/t-moeoQuickUnboundedArchiveIndex.cpp @@ -4,8 +4,7 @@ #include #include -#include -#include + //----------------------------------------------------------------------------- class ObjectiveVectorTraits : public moeoObjectiveVectorTraits