diff --git a/trunk/paradiseo-mo/docs/Doxyfile b/trunk/paradiseo-mo/docs/Doxyfile index d5074bb99..9c63e3962 100644 --- a/trunk/paradiseo-mo/docs/Doxyfile +++ b/trunk/paradiseo-mo/docs/Doxyfile @@ -1,16 +1,90 @@ -# Doxyfile 1.5.1 +# Doxyfile 1.5.2 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") #--------------------------------------------------------------------------- # 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. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + PROJECT_NAME = PARADISEO-MO + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + PROJECT_NUMBER = 0.1 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + CREATE_SUBDIRS = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# 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. + OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + ABBREVIATE_BRIEF = "The $name class" \ "The $name widget" \ "The $name file" \ @@ -22,215 +96,1173 @@ ABBREVIATE_BRIEF = "The $name class" \ a \ an \ the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like the Qt-style comments (thus requiring an +# explicit @brief command for a brief description. + JAVADOC_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + 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. + INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + 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. + 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 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 +# diagrams that involve STL classes more complete and accurate. + BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# 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 +# all members of a group must be documented explicitly. + DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + SUBGROUPING = YES + #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + EXTRACT_PRIVATE = YES + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + EXTRACT_LOCAL_METHODS = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + SORT_MEMBER_DOCS = NO + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + SORT_BRIEF_DOCS = 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 applies only to the class list, not to the +# alphabetical list. + SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + SHOW_DIRECTORIES = NO + +# 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 +# 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 +# is used as the file version. See the manual for examples. + FILE_VERSION_FILTER = + #--------------------------------------------------------------------------- # configuration options related to warning and progress messages #--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + QUIET = YES + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + WARN_LOGFILE = + #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + INPUT = ../src/ + +# 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 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# 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 + FILE_PATTERNS = *.cpp \ - *.h + *.h + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + 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 + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# 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 +# 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: +# 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. + FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + FILTER_SOURCE_FILES = NO + #--------------------------------------------------------------------------- # configuration options related to source browsing #--------------------------------------------------------------------------- + +# 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. + SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES (the default) +# 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) +# 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. + REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + VERBATIM_HEADERS = YES + #--------------------------------------------------------------------------- # configuration options related to the alphabetical class index #--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + ALPHABETICAL_INDEX = YES + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + COLS_IN_ALPHA_INDEX = 3 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + IGNORE_PREFIX = mo + #--------------------------------------------------------------------------- # configuration options related to the HTML output #--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + 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 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 +# written to the html output directory. + CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + GENERATE_CHI = NO + +# 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. + BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + TOC_EXPAND = NO + +# 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. + DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + 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 +# 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. + GENERATE_TREEVIEW = YES + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + TREEVIEW_WIDTH = 250 + #--------------------------------------------------------------------------- # configuration options related to the LaTeX output #--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + GENERATE_LATEX = YES + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + PDF_HYPERLINKS = NO + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + USE_PDFLATEX = NO + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + LATEX_HIDE_INDICES = NO + #--------------------------------------------------------------------------- # configuration options related to the RTF output #--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + RTF_EXTENSIONS_FILE = + #--------------------------------------------------------------------------- # configuration options related to the man page output #--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + GENERATE_MAN = YES + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + MAN_LINKS = NO + #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + XML_PROGRAMLISTING = YES + #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + GENERATE_AUTOGEN_DEF = NO + #--------------------------------------------------------------------------- # configuration options related to the Perl module output #--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + 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 +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + PERLMOD_MAKEVAR_PREFIX = + #--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + SKIP_FUNCTION_MACROS = YES + #--------------------------------------------------------------------------- # Configuration::additions related to external references #--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# 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 ... +# Adding location for the tag files is done as follows: +# 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) +# 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. + TAGFILES = ../../paradiseo-eo/doc/eo.doxytag=../../../paradiseo-eo/doc/html + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + GENERATE_TAGFILE = mo.doxytag + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + PERL_PATH = /usr/bin/perl + #--------------------------------------------------------------------------- # Configuration options related to the dot tool #--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + 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. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + HAVE_DOT = NO + +# 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 +# the CLASS_DIAGRAMS tag to NO. + CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH 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. + CALL_GRAPH = NO + +# 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 + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + 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 +# 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 +# If left blank png will be used. + DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 + +# The MAX_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 will always +# show the root nodes and its direct children regardless of this setting. + +DOT_GRAPH_MAX_NODES = 50 + +# 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). + DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + DOT_CLEANUP = YES + #--------------------------------------------------------------------------- # Configuration::additions related to the search engine #--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + SEARCHENGINE = YES diff --git a/trunk/paradiseo-mo/docs/html/annotated.html b/trunk/paradiseo-mo/docs/html/annotated.html index d9f175880..6e0171183 100644 --- a/trunk/paradiseo-mo/docs/html/annotated.html +++ b/trunk/paradiseo-mo/docs/html/annotated.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class List - +
+ +
+ +

PARADISEO-MO Class List

Here are the classes, structs, unions and interfaces with brief descriptions: - + - - + + - - - - + + + + - + - + - - - - + + + + - +
EmptySelectionSpecial class that describes the case of no selection
moAlgo< EOT >Description of an algorithm of the paradiseo-mo library
moAspirCrit< M >Description of the conditions in which a tabu move could be accepted
moBestImprSelect< M >One of the possible moMoveSelect
moBestImprSelect< M >One of the possible moMoveSelect
moCoolingScheduleThis class gives the description of a cooling schedule
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moExponentialCoolingScheduleOne of the possible moCoolingSchedule
moFirstImprSelect< M >One possible moMoveSelect
moGenSolContinue< EOT >One possible stop criterion for a solution-based heuristic
moHC< M >Hill Climbing (HC)
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moHCMoveLoopExpl< M >Iterative explorer used by a moHC
moImprBestFitAspirCrit< M >One of the possible moAspirCrit
moItRandNextMove< M >One of the possible moNextMove
moLinearCoolingScheduleOne of the possible moCoolingSchedule
moLSCheckPoint< M >Class which allows a checkpointing system
moMove< EOT >Definition of a move
moMoveExpl< M >Description of a move (moMove) explorer
moMoveExpl< M >Description of a move (moMove) explorer
moMoveIncrEval< M >(generally) Efficient evaluation function based a move and a solution
moMoveInit< M >Move (moMove) initializer
moMoveInit< M >Move (moMove) initializer
moMoveLoopExpl< M >Class which describes an iterative explorer
moMoveSelect< M >Class that describes a move selector (moMove)
moNextMove< M >Class which allows to generate a new move (moMove)
moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit)
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
moMoveSelect< M >Class that describes a move selector (moMove)
moNextMove< M >Class which allows to generate a new move (moMove)
moNoAspirCrit< M >One of the possible aspiration criterion (moAspirCrit)
moRandImprSelect< M >One of the possible moMove selector (moMoveSelect)
moRandMove< M >Random move generator
moSA< M >Simulated Annealing (SA)
moSimpleMoveTabuList< M >Class describing a move tabu list with a limited memory
moSimpleSolutionTabuList< M >Class describing a solution tabu list with limited length
moSolContinue< EOT >Class that describes a stop criterion for a solution-based heuristic
moTabuList< M >Class describing a tabu list that a moTS uses
moTabuList< M >Class describing a tabu list that a moTS uses
moTS< M >Tabu Search (TS)
moTSMoveLoopExpl< M >Explorer for a Tabu Search algorithm
-
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html index 5bb2aab0d..500fdcfeb 100644 --- a/trunk/paradiseo-mo/docs/html/class_empty_selection.html +++ b/trunk/paradiseo-mo/docs/html/class_empty_selection.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: EmptySelection Class Reference - +
+ +
+ +

EmptySelection Class Reference

Special class that describes the case of no selection. More...

@@ -45,8 +47,8 @@ This class is used as an exception that can be thrown if a solution selector has

Definition at line 21 of file moMoveSelect.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classes.html b/trunk/paradiseo-mo/docs/html/classes.html index c2b2114e7..b34f2547f 100644 --- a/trunk/paradiseo-mo/docs/html/classes.html +++ b/trunk/paradiseo-mo/docs/html/classes.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Alphabetical List - +
+ +
+ +

PARADISEO-MO Class Index

A | B | C | E | F | G | H | I | L | M | N | R | S | T

  A  
@@ -45,8 +47,8 @@
  G  
moMoveInit   moTabuList   
moGenSolContinue   moMoveLoopExpl   moTS   
  H  
moMoveSelect   moTSMoveLoopExpl   

A | B | C | E | F | G | H | I | L | M | N | R | S | T

-

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_algo.html b/trunk/paradiseo-mo/docs/html/classmo_algo.html index 227960530..95efaaf56 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_algo.html +++ b/trunk/paradiseo-mo/docs/html/classmo_algo.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moAlgo< EOT > Class Template Reference - +
+ +
+ +

moAlgo< EOT > Class Template Reference

Description of an algorithm of the paradiseo-mo library. More...

@@ -41,7 +43,7 @@ eoUF< EOT &, bool > eoFunctorBase - +List of all members.

Detailed Description

@@ -50,14 +52,14 @@ Description of an algorithm of the paradiseo-mo library.

-moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library. +moHC, moTS and moSA are 3 examples of algorithm of the paradiseo-mo library.

Definition at line 21 of file moAlgo.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html index ee186d179..46ba4e185 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moAspirCrit< M > Member List

This is the complete list of members for moAspirCrit< M >, including all inherited members.

- + - - + + -
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
init()=0moAspirCrit< M > [pure virtual]
operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html index 4218c6dee..081430ac9 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moAspirCrit< M > Class Template Reference - +
+ +
-

moAspirCrit< M > Class Template Reference

Description of the conditions in which a tabu move could be accepted. + + +

moAspirCrit< M > Class Template Reference

Description of the conditions in which a tabu move could be accepted. More...

#include <moAspirCrit.h> @@ -36,10 +38,10 @@

Inheritance diagram for moAspirCrit< M >:

-eoBF< A1, A2, R > -eoFunctorBase -moImprBestFitAspirCrit< M > -moNoAspirCrit< M > +eoBF< const M &, const M::EOType::Fitness &, bool > +eoFunctorBase +moImprBestFitAspirCrit< M > +moNoAspirCrit< M > List of all members. @@ -54,7 +56,7 @@ Description of the conditions in which a tabu move could be accepted.

-It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example. +It is only a description... An object that herits from this class is needed to be used in a moTS. See moNoAspriCrit for example.

@@ -86,8 +88,8 @@ Implemented in moAspirCrit.h -

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png index e6cefe1bf..b57b87786 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html index 0083f148c..8a2db1fcb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +
- + +
+ +

moBestImprSelect< M > Member List

This is the complete list of members for moBestImprSelect< M >, including all inherited members.

@@ -39,8 +41,8 @@ -
best_fitmoBestImprSelect< M > [private]
best_movemoBestImprSelect< M > [private]
update(const M &__move, const Fitness &__fit)moBestImprSelect< M > [inline, virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html index 8aeb17976..41c17d0be 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_best_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moBestImprSelect< M > Class Template Reference - +
+ +
-

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. + + +

moBestImprSelect< M > Class Template Reference

One of the possible moMoveSelect. More...

#include <moBestImprSelect.h> @@ -76,7 +78,7 @@ M moMoveSelect. +One of the possible moMoveSelect.

All neighbors are considered, and the movement which enables the best improvement is selected.

@@ -113,7 +115,7 @@ template<class M>

Function that indicates if the current move has not improved the fitness.

-If the given fitness enables an improvment, the move (moMove) and the fitness linked to this move are saved.

+If the given fitness enables an improvment, the move (moMove) and the fitness linked to this move are saved.

Parameters:
@@ -168,7 +170,7 @@ Procedure which saved the best move and fitness.
Exceptions:
__move a move.
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.
@@ -182,8 +184,8 @@ References moBest

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html index d0aa7dbaf..9d850f2d9 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moCoolingSchedule Class Reference - +
+ +
+ +

moCoolingSchedule Class Reference

This class gives the description of a cooling schedule. More...

@@ -41,20 +43,20 @@ moExponentialCoolingSchedule moLinearCoolingSchedule - +List of all members.

Detailed Description

This class gives the description of a cooling schedule.

-It is only a description... An object that herits from this class is needed to be used in a moSA. See moExponentialCoolingSchedule or moLinearCoolingSchedule for example. +It is only a description... An object that herits from this class is needed to be used in a moSA. See moExponentialCoolingSchedule or moLinearCoolingSchedule for example.

Definition at line 22 of file moCoolingSchedule.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html index 7b5b93bf3..174f13af8 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moExponentialCoolingSchedule Member List

This is the complete list of members for moExponentialCoolingSchedule, including all inherited members.

+ -
functor_category()eoUF< double &, bool > [static]
moExponentialCoolingSchedule(double __threshold, double __ratio)moExponentialCoolingSchedule [inline]
operator()(double &__temp)moExponentialCoolingSchedule [inline, virtual]
ratiomoExponentialCoolingSchedule [private]
thresholdmoExponentialCoolingSchedule [private]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html index 3d4ac92a7..ae604ae91 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_exponential_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moExponentialCoolingSchedule Class Reference - +
+ +
-

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + + +

moExponentialCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moExponentialCoolingSchedule.h> @@ -60,7 +62,7 @@ double  The decreasing factor of the temperature.

Detailed Description

-One of the possible moCoolingSchedule. +One of the possible moCoolingSchedule.

An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold.

@@ -144,8 +146,8 @@ References moExponentialCoolingSchedule.h -

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html index 6ad8a6aa2..e96dd97c5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moFirstImprSelect< M > Member List

This is the complete list of members for moFirstImprSelect< M >, including all inherited members.

@@ -41,8 +43,8 @@ -
best_fitmoFirstImprSelect< M > [private]
best_movemoFirstImprSelect< M > [private]
validmoFirstImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html index af0573bc3..515636777 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_first_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moFirstImprSelect< M > Class Template Reference - +
+ +
-

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. + + +

moFirstImprSelect< M > Class Template Reference

One possible moMoveSelect. More...

#include <moFirstImprSelect.h> @@ -79,7 +81,7 @@ M moMoveSelect. +One possible moMoveSelect.

The neighborhood is explored until a move enables an improvment of the current solution.

@@ -146,7 +148,7 @@ template<class M>

Function that indicates if the current move has not improved the fitness.

-If the given fitness enables an improvment, the move (moMove) should be applied to the current solution.

+If the given fitness enables an improvment, the move (moMove) should be applied to the current solution.

Parameters:
@@ -199,7 +201,7 @@ Procedure which saved the best move and fitness.
Exceptions:
__move a move.
- +
EmptySelection if no move has improved the fitness.
EmptySelection if no move has improved the fitness.
@@ -213,8 +215,8 @@ References moFir

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html index 9463af325..650fb5d08 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moGenSolContinue< EOT > Member List

This is the complete list of members for moGenSolContinue< EOT >, including all inherited members.

- - - + + + -
functor_category()eoUF< const EOT &, bool > [static]
init()moGenSolContinue< EOT > [inline, virtual]
maxNumGenmoGenSolContinue< EOT > [private]
moGenSolContinue(unsigned __maxNumGen)moGenSolContinue< EOT > [inline]
numGenmoGenSolContinue< EOT > [private]
maxNumGenmoGenSolContinue< EOT > [private]
moGenSolContinue(unsigned int __maxNumGen)moGenSolContinue< EOT > [inline]
numGenmoGenSolContinue< EOT > [private]
operator()(const EOT &__sol)moGenSolContinue< EOT > [inline, virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html index 0accad603..07cc22a45 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_gen_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moGenSolContinue< EOT > Class Template Reference - +
+ +
+ +

moGenSolContinue< EOT > Class Template Reference

One possible stop criterion for a solution-based heuristic. More...

@@ -43,9 +45,9 @@ List of all members. - + - + @@ -53,12 +55,12 @@ - + - +

Public Member Functions

 moGenSolContinue (unsigned __maxNumGen)
 moGenSolContinue (unsigned int __maxNumGen)
 Simple constructor.
 Simple constructor.
bool operator() (const EOT &__sol)
 Function that activates the stop criterion.
 Procedure which allows to initialise the generation counter.

Private Attributes

-unsigned maxNumGen
+unsigned int maxNumGen
 Iteration maximum number.
-unsigned numGen
+unsigned int numGen
 Iteration current number.
@@ -73,7 +75,7 @@ The stop criterion corresponds to a maximum number of iteration.

Definition at line 21 of file moGenSolContinue.h.

Constructor & Destructor Documentation

- +
@@ -82,7 +84,7 @@ template<class EOT>
moGenSolContinue< EOT >::moGenSolContinue ( - unsigned  + unsigned int  __maxNumGen  )  [inline] @@ -173,8 +175,8 @@ References moGenS

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html index 203e45876..62bfa85dd 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moHC< M > Member List

This is the complete list of members for moHC< M >, including all inherited members.

+ + + + + + -
className() consteoMonOp< M::EOType > [virtual]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoHC< M > [private]
Fitness typedefmoHC< M > [private]
full_evalmoHC< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
moHC(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
moHC(moMoveExpl< M > &__move_expl, eoEvalFunc< EOT > &__full_eval)moHC< M > [inline]
move_explmoHC< M > [private]
operator()(EOT &__sol)moHC< M > [inline, virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c.html b/trunk/paradiseo-mo/docs/html/classmo_h_c.html index e64716385..fb5fd05e4 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moHC< M > Class Template Reference - +
+ +
+ +

moHC< M > Class Template Reference

Hill Climbing (HC). More...

@@ -132,7 +134,7 @@ template<class M>

Full constructor.

-All the boxes are given in order the HC to use a moHCMoveLoopExpl.

+All the boxes are given in order the HC to use a moHCMoveLoopExpl.

Parameters:
@@ -177,7 +179,7 @@ template<class M>

Light constructor.

-This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

+This constructor allow to use another moMoveExpl (generally not a moHCMoveLoopExpl).

Parameters:
__move_init a move initialiser.
@@ -211,7 +213,7 @@ template<class M>

Function which launches the HC.

-The HC has to improve a current solution. As the moSA and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.

+The HC has to improve a current solution. As the moSA and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm.

Parameters:
__move_expl a complete explorer.
@@ -229,8 +231,8 @@ References moHC< M >::fu

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html index e1ffde6c4..b24df57e1 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +
__sol a current solution to improve.
- + +
+ +

moHCMoveLoopExpl< M > Member List

This is the complete list of members for moHCMoveLoopExpl< M >, including all inherited members.

+ -
EOT typedefmoHCMoveLoopExpl< M > [private]
Fitness typedefmoHCMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoHCMoveLoopExpl< M > [private]
moHCMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moMoveSelect< M > &__move_select)moHCMoveLoopExpl< M > [inline]
move_initmoHCMoveLoopExpl< M > [private]
move_selectmoHCMoveLoopExpl< M > [private]
next_movemoHCMoveLoopExpl< M > [private]
operator()(const EOT &__old_sol, EOT &__new_sol)moHCMoveLoopExpl< M > [inline, virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html index 7754bf5f4..e9c1ede65 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_h_c_move_loop_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moHCMoveLoopExpl< M > Class Template Reference - +
+ +
-

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. + + +

moHCMoveLoopExpl< M > Class Template Reference

Iterative explorer used by a moHC. More...

#include <moHCMoveLoopExpl.h> @@ -81,7 +83,7 @@ typedef M::EOType::Fitness template<class M>
class moHCMoveLoopExpl< M > -Iterative explorer used by a moHC. +Iterative explorer used by a moHC.

@@ -191,8 +193,8 @@ References moHC

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html index cd6d59889..0c0cd05ef 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moImprBestFitAspirCrit< M > Member List

This is the complete list of members for moImprBestFitAspirCrit< M >, including all inherited members.

- + - - - + + -
best_fitmoImprBestFitAspirCrit< M > [private]
first_timemoImprBestFitAspirCrit< M > [private]
Fitness typedefmoImprBestFitAspirCrit< M >
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
init()moImprBestFitAspirCrit< M > [inline, virtual]
moImprBestFitAspirCrit()moImprBestFitAspirCrit< M > [inline]
operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline]
moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
operator()(const M &__move, const Fitness &__fit)moImprBestFitAspirCrit< M > [inline, virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html index ff292cbf1..e24ecb373 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moImprBestFitAspirCrit< M > Class Template Reference - +
+ +
-

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. + + +

moImprBestFitAspirCrit< M > Class Template Reference

One of the possible moAspirCrit. More...

#include <moImprBestFitAspirCrit.h> @@ -36,9 +38,9 @@

Inheritance diagram for moImprBestFitAspirCrit< M >:

-moAspirCrit< M > -eoBF< A1, A2, R > -eoFunctorBase +moAspirCrit< M > +eoBF< const M &, const M::EOType::Fitness &, bool > +eoFunctorBase List of all members. @@ -73,7 +75,7 @@ bool  - +
moAspirCrit. +One of the possible moAspirCrit.

This criterion is satisfied when a given fitness is the best ever considered.

@@ -101,7 +103,7 @@ template<class M>

) [inline] [inline, virtual]
@@ -119,6 +121,8 @@ The first time, the function only saved the current move and fitness.

Returns:
TRUE the first time and if __fit > best_fit, else FALSE.
+

+Implements eoBF< const M &, const M::EOType::Fitness &, bool >.

Definition at line 52 of file moImprBestFitAspirCrit.h.

@@ -127,8 +131,8 @@ References moImprBestFitAspirCrit.h -

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png index 76e0473f0..9cb9fec17 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_impr_best_fit_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html index cc78e06b1..8b5908428 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moItRandNextMove< M > Member List

This is the complete list of members for moItRandNextMove< M >, including all inherited members.

- - - - + + + + + -
EOT typedefmoItRandNextMove< M > [private]
max_itermoItRandNextMove< M > [private]
moItRandNextMove(moRandMove< M > &__rand_move, unsigned __max_iter)moItRandNextMove< M > [inline]
num_itermoItRandNextMove< M > [private]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline]
functor_category()eoBF< M &, const M::EOType &, bool > [static]
max_itermoItRandNextMove< M > [private]
moItRandNextMove(moRandMove< M > &__rand_move, unsigned int __max_iter)moItRandNextMove< M > [inline]
num_itermoItRandNextMove< M > [private]
operator()(M &__move, const EOT &__sol)moItRandNextMove< M > [inline, virtual]
rand_movemoItRandNextMove< M > [private]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + ~eoBF()eoBF< M &, const M::EOType &, bool > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html index 474989d52..295a06426 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moItRandNextMove< M > Class Template Reference - +
+ +
-

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. + + +

moItRandNextMove< M > Class Template Reference

One of the possible moNextMove. More...

#include <moItRandNextMove.h> @@ -36,16 +38,16 @@

Inheritance diagram for moItRandNextMove< M >:

-moNextMove< M > -eoBF< A1, A2, R > -eoFunctorBase +moNextMove< M > +eoBF< M &, const M::EOType &, bool > +eoFunctorBase List of all members. - + - + @@ -59,12 +61,12 @@ typedef M::EOType  - + - +

Public Member Functions

 moItRandNextMove (moRandMove< M > &__rand_move, unsigned __max_iter)
 moItRandNextMove (moRandMove< M > &__rand_move, unsigned int __max_iter)
 The constructor.
 The constructor.
bool operator() (M &__move, const EOT &__sol)
 Generation of a new move.
moRandMove< M > & rand_move
 A move generator (generally randomly).
-unsigned max_iter
+unsigned int max_iter
 Iteration maximum number.
-unsigned num_iter
+unsigned int num_iter
 Iteration current number.
@@ -72,14 +74,14 @@ unsigned moNextMove. +One of the possible moNextMove.

-This class is a move (moMove) generator with a bound for the maximum number of iterations. +This class is a move (moMove) generator with a bound for the maximum number of iterations.

Definition at line 22 of file moItRandNextMove.h.

Constructor & Destructor Documentation

- +
@@ -94,7 +96,7 @@ template<class M>
- unsigned  + unsigned int  __max_iter  @@ -143,7 +145,7 @@ template<class M>
) - [inline] + [inline, virtual]
@@ -161,6 +163,8 @@ If the maximum number is not already reached, the current move is forgotten and
Returns:
FALSE if the maximum number of iteration is reached, else TRUE.
+

+Implements eoBF< M &, const M::EOType &, bool >.

Definition at line 52 of file moItRandNextMove.h.

@@ -169,8 +173,8 @@ References moItR

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png index a90754a6b..52d789f14 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_it_rand_next_move.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html index a5cd6f2d9..d60b4e276 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moLSCheckPoint< M > Member List

This is the complete list of members for moLSCheckPoint< M >, including all inherited members.

- + - - + + -
add(eoBF< const M &, const typename M::EOType &, void > &__f)moLSCheckPoint< M > [inline]
funcmoLSCheckPoint< M > [private]
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType &, void > [static]
operator()(const M &__move, const typename M::EOType &__sol)moLSCheckPoint< M > [inline]
eoBF::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
eoBF< const M &, const M::EOType &, void >::operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, void > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html index adf7eabcb..790d11ff3 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html +++ b/trunk/paradiseo-mo/docs/html/classmo_l_s_check_point.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moLSCheckPoint< M > Class Template Reference - +
+ +
-

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. + + +

moLSCheckPoint< M > Class Template Reference

Class which allows a checkpointing system. More...

#include <moLSCheckPoint.h> @@ -36,8 +38,8 @@

Inheritance diagram for moLSCheckPoint< M >:

-eoBF< A1, A2, R > -eoFunctorBase +eoBF< const M &, const M::EOType &, void > +eoFunctorBase List of all members. @@ -146,8 +148,8 @@ References moLSChe

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html index faf69063e..973c657a6 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +
- + +
+ +

moLinearCoolingSchedule Member List

This is the complete list of members for moLinearCoolingSchedule, including all inherited members.

+ -
functor_category()eoUF< double &, bool > [static]
moLinearCoolingSchedule(double __threshold, double __quantity)moLinearCoolingSchedule [inline]
operator()(double &__temp)moLinearCoolingSchedule [inline, virtual]
quantitymoLinearCoolingSchedule [private]
thresholdmoLinearCoolingSchedule [private]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoUF()eoUF< double &, bool > [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html index 87b5aa571..ca5b34edb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html +++ b/trunk/paradiseo-mo/docs/html/classmo_linear_cooling_schedule.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moLinearCoolingSchedule Class Reference - +
+ +
-

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. + + +

moLinearCoolingSchedule Class Reference

One of the possible moCoolingSchedule. More...

#include <moLinearCoolingSchedule.h> @@ -60,7 +62,7 @@ double  The quantity that allows the temperature to decrease.

Detailed Description

-One of the possible moCoolingSchedule. +One of the possible moCoolingSchedule.

An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold.

@@ -144,8 +146,8 @@ References

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move-members.html b/trunk/paradiseo-mo/docs/html/classmo_move-members.html index 3935646a1..26dd2d3fe 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moMove< EOT > Member List

This is the complete list of members for moMove< EOT >, including all inherited members.

-
EOType typedefmoMove< EOT >
functor_category()eoUF< EOT &, void > [static]
operator()(EOT &)=0eoUF< EOT &, void > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< EOT &, void > [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move.html b/trunk/paradiseo-mo/docs/html/classmo_move.html index 451bfb90a..bc11942b4 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMove< EOT > Class Template Reference - +
+ +
+ +

moMove< EOT > Class Template Reference

Definition of a move. More...

@@ -59,8 +61,8 @@ A move transforms a solution to another close solution. It describes how a solut

Definition at line 23 of file moMove.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html index a764d2957..3540b3294 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveExpl< M > Class Template Reference - +
+ +
-

moMoveExpl< M > Class Template Reference

Description of a move (moMove) explorer. + + +

moMoveExpl< M > Class Template Reference

Description of a move (moMove) explorer. More...

#include <moMoveExpl.h> @@ -42,23 +44,23 @@ moHCMoveLoopExpl< M > moTSMoveLoopExpl< M > - +List of all members.

Detailed Description

template<class M>
class moMoveExpl< M >

-Description of a move (moMove) explorer. +Description of a move (moMove) explorer.

-Only a description...See moMoveLoopExpl. +Only a description...See moMoveLoopExpl.

Definition at line 21 of file moMoveExpl.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html index 0a29ee99c..053faa9b0 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_incr_eval.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveIncrEval< M > Class Template Reference - +
+ +
-

moMoveIncrEval< M > Class Template Reference

(generally) Efficient evaluation function based a move and a solution. + + +

moMoveIncrEval< M > Class Template Reference

(generally) Efficient evaluation function based a move and a solution. More...

#include <moMoveIncrEval.h> @@ -36,10 +38,10 @@

Inheritance diagram for moMoveIncrEval< M >:

-eoBF< A1, A2, R > -eoFunctorBase +eoBF< const M &, const M::EOType &, M::EOType::Fitness > +eoFunctorBase - +List of all members.

Detailed Description

@@ -54,8 +56,8 @@ From a move and a solution, it computes a new fitness that could be associated t

Definition at line 24 of file moMoveIncrEval.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_init.html b/trunk/paradiseo-mo/docs/html/classmo_move_init.html index ece1a47e9..dbfc9b043 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_init.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_init.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveInit< M > Class Template Reference - +
+ +
-

moMoveInit< M > Class Template Reference

Move (moMove) initializer. + + +

moMoveInit< M > Class Template Reference

Move (moMove) initializer. More...

#include <moMoveInit.h> @@ -36,17 +38,17 @@

Inheritance diagram for moMoveInit< M >:

-eoBF< A1, A2, R > -eoFunctorBase +eoBF< M &, const M::EOType &, void > +eoFunctorBase - +List of all members.

Detailed Description

template<class M>
class moMoveInit< M >

-Move (moMove) initializer. +Move (moMove) initializer.

Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used.

@@ -54,8 +56,8 @@ Class which allows to initiase a move. Only a description... An object that heri

Definition at line 22 of file moMoveInit.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html index 0938c9cbd..14c046b00 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_loop_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveLoopExpl< M > Class Template Reference - +
+ +
+ +

moMoveLoopExpl< M > Class Template Reference

Class which describes an iterative explorer. More...

@@ -42,7 +44,7 @@ moHCMoveLoopExpl< M > moTSMoveLoopExpl< M > - +List of all members.

Detailed Description

@@ -51,14 +53,14 @@ Class which describes an iterative explorer.

-Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl. +Only a description... moHCMoveLoopExpl and moTSMoveLoopExpl are exemples of class that are a moMoveLoopExpl.

Definition at line 21 of file moMoveLoopExpl.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html index 9b449fba6..ec1f6412f 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moMoveSelect< M > Member List

This is the complete list of members for moMoveSelect< M >, including all inherited members.

@@ -36,8 +38,8 @@ -
Fitness typedefmoMoveSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
update(const M &__move, const Fitness &__fit)=0moMoveSelect< M > [pure virtual]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_move_select.html b/trunk/paradiseo-mo/docs/html/classmo_move_select.html index 604be96c5..322c5bce8 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_move_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_move_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moMoveSelect< M > Class Template Reference - +
+ +
-

moMoveSelect< M > Class Template Reference

Class that describes a move selector (moMove). + + +

moMoveSelect< M > Class Template Reference

Class that describes a move selector (moMove). More...

#include <moMoveSelect.h> @@ -61,9 +63,9 @@ typedef M::EOType::Fitness template<class M>
class moMoveSelect< M > -Class that describes a move selector (moMove). +Class that describes a move selector (moMove).

-It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (moMove) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed.

@@ -144,8 +146,8 @@ Implemented in moMoveSelect.h -

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.html b/trunk/paradiseo-mo/docs/html/classmo_next_move.html index 52f144bb7..544803e2f 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_next_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_next_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moNextMove< M > Class Template Reference - +
+ +
-

moNextMove< M > Class Template Reference

Class which allows to generate a new move (moMove). + + +

moNextMove< M > Class Template Reference

Class which allows to generate a new move (moMove). More...

#include <moNextMove.h> @@ -36,27 +38,27 @@

Inheritance diagram for moNextMove< M >:

-eoBF< A1, A2, R > -eoFunctorBase -moItRandNextMove< M > +eoBF< M &, const M::EOType &, bool > +eoFunctorBase +moItRandNextMove< M > - +List of all members.

Detailed Description

template<class M>
class moNextMove< M >

-Class which allows to generate a new move (moMove). +Class which allows to generate a new move (moMove).

-Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for moTS or moHC). Does nothing... An object that herits from this class needs to be designed for being used.

Definition at line 22 of file moNextMove.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_next_move.png b/trunk/paradiseo-mo/docs/html/classmo_next_move.png index 6bc1397f2..f0527341d 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_next_move.png and b/trunk/paradiseo-mo/docs/html/classmo_next_move.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html index 0919e5835..0e30b68b9 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moNoAspirCrit< M > Member List

This is the complete list of members for moNoAspirCrit< M >, including all inherited members.

- + - - + + -
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType::Fitness &, bool > [static]
init()moNoAspirCrit< M > [inline, private, virtual]
operator()(const M &__move, const typename M::EOType::Fitness &__sol)moNoAspirCrit< M > [inline, private]
moAspirCrit::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
moAspirCrit::operator()(const M &, const M::EOType::Fitness &)=0eoBF< const M &, const M::EOType::Fitness &, bool > [pure virtual]
~eoBF()eoBF< const M &, const M::EOType::Fitness &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html index 806d66786..21bbaf972 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html +++ b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moNoAspirCrit< M > Class Template Reference - +
+ +
-

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). + + +

moNoAspirCrit< M > Class Template Reference

One of the possible aspiration criterion (moAspirCrit). More...

#include <moNoAspirCrit.h> @@ -36,9 +38,9 @@

Inheritance diagram for moNoAspirCrit< M >:

-moAspirCrit< M > -eoBF< A1, A2, R > -eoFunctorBase +moAspirCrit< M > +eoBF< const M &, const M::EOType::Fitness &, bool > +eoFunctorBase List of all members. @@ -48,13 +50,13 @@ - +
 Function which describes the aspiration criterion behaviour.
void init ()
 Procedure which initialises all that needs a moNoAspirCrit.
 Procedure which initialises all that needs a moNoAspirCrit.

Detailed Description

template<class M>
class moNoAspirCrit< M >

-One of the possible aspiration criterion (moAspirCrit). +One of the possible aspiration criterion (moAspirCrit).

The simplest : never satisfied.

@@ -122,7 +124,7 @@ template<class M>

-Procedure which initialises all that needs a moNoAspirCrit. +Procedure which initialises all that needs a moNoAspirCrit.

Nothing...

@@ -133,8 +135,8 @@ Definition at line 4

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png index ce623c0e3..2faca5ab9 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png and b/trunk/paradiseo-mo/docs/html/classmo_no_aspir_crit.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html index 657e4d0dc..6b52e5545 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moRandImprSelect< M > Member List

This is the complete list of members for moRandImprSelect< M >, including all inherited members.

@@ -39,8 +41,8 @@ -
Fitness typedefmoRandImprSelect< M >
functor_category()eoBF< M &, M::EOType::Fitness &, void > [static]
vect_better_movesmoRandImprSelect< M > [private]
~eoBF()eoBF< M &, M::EOType::Fitness &, void > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html index d3b67b370..7c1c6d652 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_impr_select.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moRandImprSelect< M > Class Template Reference - +
+ +
-

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). + + +

moRandImprSelect< M > Class Template Reference

One of the possible moMove selector (moMoveSelect). More...

#include <moRandImprSelect.h> @@ -50,7 +52,7 @@ typedef M::EOType::Fitness 

Public Member Functions

void init (const Fitness &__fit) - Procedure which all that needs a moRandImprSelect.
+ Procedure which all that needs a moRandImprSelect.
bool update (const M &__move, const Fitness &__fit)  Function that updates the fitness and move vectors.
@@ -75,7 +77,7 @@ std::vector< M > template<class M>
class moRandImprSelect< M > -One of the possible moMove selector (moMoveSelect). +One of the possible moMove selector (moMoveSelect).

All the neighbors are considered. One of them that enables an improvment of the objective function is choosen.

@@ -101,7 +103,7 @@ template<class M>

-Procedure which all that needs a moRandImprSelect. +Procedure which all that needs a moRandImprSelect.

Give a value to the initialise fitness. Clean the move and fitness vectors.

Parameters:
@@ -204,7 +206,7 @@ One the saved move is randomly chosen.

Exceptions:
- +
EmptySelection If no move which improves the current fitness are found.
EmptySelection If no move which improves the current fitness are found.
@@ -218,8 +220,8 @@ References

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html index 27f3f3afd..461e2cd52 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_rand_move.html +++ b/trunk/paradiseo-mo/docs/html/classmo_rand_move.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moRandMove< M > Class Template Reference - +
+ +
+ +

moRandMove< M > Class Template Reference

Random move generator. More...

@@ -39,7 +41,7 @@ eoUF< M &, void > eoFunctorBase - +List of all members.

Detailed Description

@@ -48,14 +50,14 @@ Random move generator.

-Only a description... An object that herits from this class needs to be designed in order to use a moSA. +Only a description... An object that herits from this class needs to be designed in order to use a moSA.

Definition at line 21 of file moRandMove.h.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html index 23cb4d98c..e8ed7ad38 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moSA< M > Member List

This is the complete list of members for moSA< M >, including all inherited members.

+ + + + + + -
className() consteoMonOp< M::EOType > [virtual]
contmoSA< M > [private]
cool_schedmoSA< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoSA< M > [private]
Fitness typedefmoSA< M > [private]
full_evalmoSA< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
incr_evalmoSA< M > [private]
init_tempmoSA< M > [private]
moSA(moRandMove< M > &__move_rand, moMoveIncrEval< M > &__incr_eval, moSolContinue< EOT > &__cont, double __init_temp, moCoolingSchedule &__cool_sched, eoEvalFunc< EOT > &__full_eval)moSA< M > [inline]
move_randmoSA< M > [private]
operator()(EOT &__sol)moSA< M > [inline, virtual]

Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_s_a.html b/trunk/paradiseo-mo/docs/html/classmo_s_a.html index bdacf8bbc..b6fccf877 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_s_a.html +++ b/trunk/paradiseo-mo/docs/html/classmo_s_a.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSA< M > Class Template Reference - +
+ +
+ +

moSA< M > Class Template Reference

Simulated Annealing (SA). More...

@@ -189,7 +191,7 @@ template<class M>

function that launches the SA algorithm.

-As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

+As a moTS or a moHC, the SA can be used for HYBRIDATION in an evolutionary algorithm.

Parameters:
@@ -202,13 +204,13 @@ Implements Definition at line 82 of file moSA.h.

-References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform(). +References moSA< M >::cont, moSA< M >::cool_sched, moSA< M >::full_eval, moSA< M >::incr_eval, moSA< M >::init_temp, moSA< M >::move_rand, and eoRng::uniform().

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html index e3bcbcf0e..5673eee40 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +
__sol a solution to improve.
- + +
+ +

moSimpleMoveTabuList< M > Member List

This is the complete list of members for moSimpleMoveTabuList< M >, including all inherited members.

- + - + - - - - + + + - + -
add(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
currentSizemoSimpleMoveTabuList< M > [private]
currentSizemoSimpleMoveTabuList< M > [private]
EOT typedefmoSimpleMoveTabuList< M >
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
init()moSimpleMoveTabuList< M > [inline, virtual]
maxSizemoSimpleMoveTabuList< M > [private]
moSimpleMoveTabuList(unsigned __size)moSimpleMoveTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
maxSizemoSimpleMoveTabuList< M > [private]
moSimpleMoveTabuList(unsigned int __size)moSimpleMoveTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleMoveTabuList< M > [inline, virtual]
removeMove(const M &__move)moSimpleMoveTabuList< M > [inline, private]
tabuListmoSimpleMoveTabuList< M > [private]
update()moSimpleMoveTabuList< M > [inline, virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html index 6eebf82d1..68f5f142a 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSimpleMoveTabuList< M > Class Template Reference - +
+ +
+ +

moSimpleMoveTabuList< M > Class Template Reference

Class describing a move tabu list with a limited memory. More...

@@ -36,9 +38,9 @@

Inheritance diagram for moSimpleMoveTabuList< M >:

-moTabuList< M > -eoBF< A1, A2, R > -eoFunctorBase +moTabuList< M > +eoBF< const M &, const M::EOType &, bool > +eoFunctorBase List of all members. @@ -48,8 +50,8 @@ typedef M::EOType  - + @@ -69,12 +71,12 @@ typedef M::EOType  - + - + - +
 Alias for the type.

Public Member Functions

- moSimpleMoveTabuList (unsigned __size)
+ moSimpleMoveTabuList (unsigned int __size)
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Procedure that removes a given move from the tabu list (if it is into, else do nothing).

Private Attributes

-unsigned maxSize
+unsigned int maxSize
 The maximum size of the tabu list.
-unsigned currentSize
+unsigned int currentSize
 The current size of the tabu list.
@@ -112,7 +114,7 @@ template<class M>
) [inline] [inline, virtual]
@@ -123,12 +125,14 @@ Function that indicates if, in a given state, the _move is tabu or not.

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
Returns:
true or false.
+

+Implements eoBF< const M &, const M::EOType &, bool >.

Definition at line 46 of file moSimpleMoveTabuList.h.

@@ -258,7 +262,7 @@ Procedure that removes a given move from the tabu list (if it is into, else do n

Parameters:
- +
__move A given moMove.
__move A given moMove.
@@ -272,8 +276,8 @@ Referenced by moSimpleMoveTabuList.h -
Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png index f4a038c83..b291321fa 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_simple_move_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html index 9ee162de4..9de337544 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moSimpleSolutionTabuList< M > Member List

This is the complete list of members for moSimpleSolutionTabuList< M >, including all inherited members.

- + - + - - - - + + + - + -
add(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
currentSizemoSimpleSolutionTabuList< M > [private]
currentSizemoSimpleSolutionTabuList< M > [private]
EOT typedefmoSimpleSolutionTabuList< M >
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
init()moSimpleSolutionTabuList< M > [inline, virtual]
maxSizemoSimpleSolutionTabuList< M > [private]
moSimpleSolutionTabuList(unsigned __size)moSimpleSolutionTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline]
moTabuList::operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
maxSizemoSimpleSolutionTabuList< M > [private]
moSimpleSolutionTabuList(unsigned int __size)moSimpleSolutionTabuList< M > [inline]
operator()(const M &__move, const EOT &__sol)moSimpleSolutionTabuList< M > [inline, virtual]
removeSolution(const EOT &__sol)moSimpleSolutionTabuList< M > [inline, private]
tabuListmoSimpleSolutionTabuList< M > [private]
update()moSimpleSolutionTabuList< M > [inline, virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html index d0e68795e..a49b02cdb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSimpleSolutionTabuList< M > Class Template Reference - +
+ +
+ +

moSimpleSolutionTabuList< M > Class Template Reference

Class describing a solution tabu list with limited length. More...

@@ -36,9 +38,9 @@

Inheritance diagram for moSimpleSolutionTabuList< M >:

-moTabuList< M > -eoBF< A1, A2, R > -eoFunctorBase +moTabuList< M > +eoBF< const M &, const M::EOType &, bool > +eoFunctorBase List of all members. @@ -48,9 +50,9 @@ typedef M::EOType  - + - + @@ -68,12 +70,12 @@ typedef M::EOType  - + - + - + @@ -145,7 +147,7 @@ template<class M> - +
 Alias for the type.

Public Member Functions

 moSimpleSolutionTabuList (unsigned __size)
 moSimpleSolutionTabuList (unsigned int __size)
 Constructor.
 Constructor.
bool operator() (const M &__move, const EOT &__sol)
 Function that indicates if, in a given state, the _move is tabu or not.
 Procedure that removes a given solution from the tabu list (if it is into, else does nothing).

Private Attributes

-unsigned maxSize
+unsigned int maxSize
 The maximum size of the tabu list.
-unsigned currentSize
+unsigned int currentSize
 The current size of the tabu list.
@@ -90,7 +92,7 @@ Class describing a solution tabu list with limited length.

Definition at line 22 of file moSimpleSolutionTabuList.h.

Constructor & Destructor Documentation

- +
@@ -99,7 +101,7 @@ template<class M>
moSimpleSolutionTabuList< M >::moSimpleSolutionTabuList (unsigned unsigned int  __size  )  [inline]
) [inline] [inline, virtual]
@@ -156,12 +158,14 @@ Function that indicates if, in a given state, the _move is tabu or not.

Parameters:
- +
__move A given moMove.
__move A given moMove.
__sol A solution.
Returns:
true or false.
+

+Implements eoBF< const M &, const M::EOType &, bool >.

Definition at line 45 of file moSimpleSolutionTabuList.h.

@@ -305,8 +309,8 @@ Referenced by moSimpleSolutionTabuList.h -

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png index 38d26e329..df07eba57 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_simple_solution_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html index e0841d2a5..d5776b841 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moSolContinue< EOT > Member List

This is the complete list of members for moSolContinue< EOT >, including all inherited members.

-
functor_category()eoUF< const EOT &, bool > [static]
init()=0moSolContinue< EOT > [pure virtual]
operator()(const EOT &)=0eoUF< const EOT &, bool > [pure virtual]
~eoFunctorBase()eoFunctorBase [virtual]
~eoUF()eoUF< const EOT &, bool > [virtual]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html index 128fad0ea..3824d8da7 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html +++ b/trunk/paradiseo-mo/docs/html/classmo_sol_continue.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moSolContinue< EOT > Class Template Reference - +
+ +
+ +

moSolContinue< EOT > Class Template Reference

Class that describes a stop criterion for a solution-based heuristic. More...

@@ -85,8 +87,8 @@ Implemented in moSolContinue.h -

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html index c71666684..a8b34f7ad 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moTS< M > Member List

This is the complete list of members for moTS< M >, including all inherited members.

+ + + + - + + + - + -
className() consteoMonOp< M::EOType > [virtual]
contmoTS< M > [private]
eoMonOp()eoMonOp< M::EOType >
eoOp(OpType _type)eoOp< EOType >
eoOp(const eoOp &_eop)eoOp< EOType >
EOT typedefmoTS< M > [private]
first_timemoTS< M > [private, static]
first_timemoTS< M > [inline, private, static]
Fitness typedefmoTS< M > [private]
full_evalmoTS< M > [private]
functor_category()eoUF< M::EOType &, bool > [static]
getType() consteoOp< EOType >
moTS(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
moTS(moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)moTS< M > [inline]
move_explmoTS< M > [private]
mutexmoTS< M > [private, static]
mutexmoTS< M > [inline, private, static]
operator()(EOT &__sol)moTS< M > [inline, virtual]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  + OpType enum nameeoOp< EOType > + ~eoFunctorBase()eoFunctorBase [virtual] + ~eoOp()eoOp< EOType > [virtual] + ~eoUF()eoUF< M::EOType &, bool > [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s.html b/trunk/paradiseo-mo/docs/html/classmo_t_s.html index afe7beebf..0b37824ee 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTS< M > Class Template Reference - +
+ +
+ +

moTS< M > Class Template Reference

Tabu Search (TS). More...

@@ -47,7 +49,7 @@

Public Member Functions

 moTS (moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval) - Constructor of a moTS specifying all the boxes.
+ Constructor of a moTS specifying all the boxes.
 moTS (moMoveExpl< M > &__move_expl, moSolContinue< EOT > &__cont, eoEvalFunc< EOT > &__full_eval)  Constructor with less parameters.
@@ -78,7 +80,7 @@ typedef EOT::Fitness  Full evaluation function.

Static Private Attributes

 -static bool first_time +static bool first_time = true  Boolean allowing to initialise the ptread_mutex_t in the constructor.
@@ -155,9 +157,9 @@ template<class M>

-Constructor of a moTS specifying all the boxes. +Constructor of a moTS specifying all the boxes.

-In this constructor, a moTSMoveLoopExpl is instanciated.

+In this constructor, a moTSMoveLoopExpl is instanciated.

Parameters:
@@ -173,7 +175,7 @@ In this constructor, a moTS

Definition at line 59 of file moTS.h.

-References moTS< M >::first_time, and moTS< M >::mutex. +References moTS< M >::first_time, and moTS< M >::mutex.

@@ -215,7 +217,7 @@ Constructor with less parameters. The explorer is given in the parameters.

Parameters:
__move_init move initialisation
- +
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__move_expl the explorer (generally different that a moTSMoveLoopExpl)
__cont stop criterion
__full_eval full evaluation function
@@ -224,7 +226,7 @@ The explorer is given in the parameters.

Definition at line 81 of file moTS.h.

-References moTS< M >::first_time, and moTS< M >::mutex. +References moTS< M >::first_time, and moTS< M >::mutex.

Member Function Documentation

@@ -249,7 +251,7 @@ template<class M>

Function which launchs the Tabu Search.

-Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.

+Algorithm of the tabu search. As a moSA or a moHC, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread_mutex_t) is closed during the algorithm.

Parameters:
@@ -262,13 +264,13 @@ Implements Definition at line 104 of file moTS.h.

-References moTS< M >::cont, moTS< M >::full_eval, moTS< M >::move_expl, and moTS< M >::mutex. +References moTS< M >::cont, moTS< M >::full_eval, moTS< M >::move_expl, and moTS< M >::mutex.

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html index d5c8f0341..7e9f97955 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl-members.html @@ -1,14 +1,14 @@ - +PARADISEO-MO: Member List - +
__sol a solution to improve.
- + +
+ +

moTSMoveLoopExpl< M > Member List

This is the complete list of members for moTSMoveLoopExpl< M >, including all inherited members.

+ @@ -39,8 +42,10 @@ -
aspir_critmoTSMoveLoopExpl< M > [private]
EOT typedefmoTSMoveLoopExpl< M > [private]
Fitness typedefmoTSMoveLoopExpl< M > [private]
functor_category()eoBF< const M::EOType &, M::EOType &, void > [static]
incr_evalmoTSMoveLoopExpl< M > [private]
moTSMoveLoopExpl(moMoveInit< M > &__move_init, moNextMove< M > &__next_move, moMoveIncrEval< M > &__incr_eval, moTabuList< M > &__tabu_list, moAspirCrit< M > &__aspir_crit)moTSMoveLoopExpl< M > [inline]
move_initmoTSMoveLoopExpl< M > [private]
next_movemoTSMoveLoopExpl< M > [private]
operator()(const EOT &__old_sol, EOT &__new_sol)moTSMoveLoopExpl< M > [inline, virtual]
tabu_listmoTSMoveLoopExpl< M > [private]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  + ~eoBF()eoBF< const M::EOType &, M::EOType &, void > [virtual] + ~eoFunctorBase()eoFunctorBase [virtual] +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html index f1f34c5dc..0ed775ed6 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html +++ b/trunk/paradiseo-mo/docs/html/classmo_t_s_move_loop_expl.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTSMoveLoopExpl< M > Class Template Reference - +
+ +
+ +

moTSMoveLoopExpl< M > Class Template Reference

Explorer for a Tabu Search algorithm. More...

@@ -91,7 +93,7 @@ typedef M::EOType::Fitness  -It is used by a moTS. +It is used by a moTS.

@@ -209,8 +211,8 @@ References moTS

The documentation for this class was generated from the following file: -
Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html index 445d8bbd4..4444383a5 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list-members.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Member List - +
+ +
+ +

moTabuList< M > Member List

This is the complete list of members for moTabuList< M >, including all inherited members.

- + - + - + -
add(const M &__move, const EOT &__sol)=0moTabuList< M > [pure virtual]
EOT typedefmoTabuList< M >
functor_category()eoBF< A1, A2, R > [static]
functor_category()eoBF< const M &, const M::EOType &, bool > [static]
init()=0moTabuList< M > [pure virtual]
operator()(A1, A2)=0eoBF< A1, A2, R > [pure virtual]
operator()(const M &, const M::EOType &)=0eoBF< const M &, const M::EOType &, bool > [pure virtual]
update()=0moTabuList< M > [pure virtual]
~eoBF()eoBF< A1, A2, R > [virtual]
~eoBF()eoBF< const M &, const M::EOType &, bool > [virtual]
~eoFunctorBase()eoFunctorBase [virtual]

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html index 5b5c67e6c..34492cbbb 100644 --- a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html +++ b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: moTabuList< M > Class Template Reference - +
+ +
-

moTabuList< M > Class Template Reference

Class describing a tabu list that a moTS uses. + + +

moTabuList< M > Class Template Reference

Class describing a tabu list that a moTS uses. More...

#include <moTabuList.h> @@ -36,10 +38,10 @@

Inheritance diagram for moTabuList< M >:

-eoBF< A1, A2, R > -eoFunctorBase -moSimpleMoveTabuList< M > -moSimpleSolutionTabuList< M > +eoBF< const M &, const M::EOType &, bool > +eoFunctorBase +moSimpleMoveTabuList< M > +moSimpleSolutionTabuList< M > List of all members. @@ -63,9 +65,9 @@ typedef M::EOType 
moTS uses. +Class describing a tabu list that a moTS uses.

-It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a moTS.

@@ -164,8 +166,8 @@ Implemented in moTabuList.h -

Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png index b4c545581..c9d3346ba 100644 Binary files a/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png and b/trunk/paradiseo-mo/docs/html/classmo_tabu_list.png differ diff --git a/trunk/paradiseo-mo/docs/html/files.html b/trunk/paradiseo-mo/docs/html/files.html index a6e43dbc8..91391dc7d 100644 --- a/trunk/paradiseo-mo/docs/html/files.html +++ b/trunk/paradiseo-mo/docs/html/files.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: File Index - +
+ +

PARADISEO-MO File List

Here is a list of all documented files with brief descriptions: @@ -55,8 +56,8 @@
index.h [code]
mo.h [code]
moTS.h [code]
moTSMoveLoopExpl.h [code]
-
Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
+doxygen 1.5.2
diff --git a/trunk/paradiseo-mo/docs/html/functions.html b/trunk/paradiseo-mo/docs/html/functions.html index ec1068ece..518834b97 100644 --- a/trunk/paradiseo-mo/docs/html/functions.html +++ b/trunk/paradiseo-mo/docs/html/functions.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - +
- + +
+
  • Class Members
    • + +

    - e -

    - f -

    • first_time @@ -123,73 +131,56 @@ Here is a list of all documented class members with links to the class documenta
    • func : moLSCheckPoint< M >
    +

    - g -

    +

    - h -

    - i -

    -

    - m -

    +

    - l -

    +

    - m -

    @@ -198,9 +189,9 @@ Here is a list of all documented class members with links to the class documenta : moHCMoveLoopExpl< M > , moTSMoveLoopExpl< M >
  • num_iter -: moItRandNextMove< M > +: moItRandNextMove< M >
  • numGen -: moGenSolContinue< EOT > +: moGenSolContinue< EOT >

    - o -

    • operator()() @@ -236,7 +227,19 @@ Here is a list of all documented class members with links to the class documenta
    • removeSolution() : moSimpleSolutionTabuList< M >
    +

    - s -

    - t -

    - v -

    -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/functions_func.html b/trunk/paradiseo-mo/docs/html/functions_func.html index dc047278e..1b3469991 100644 --- a/trunk/paradiseo-mo/docs/html/functions_func.html +++ b/trunk/paradiseo-mo/docs/html/functions_func.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Functions - +
    + +
    • +
  • Class Members
    • + +
    @@ -39,10 +41,15 @@
    @@ -57,46 +64,42 @@ , moSimpleSolutionTabuList< M > , moSimpleMoveTabuList< M > +

    - e -

    +

    - g -

    +

    - h -

    - i -

    -

    - m -

    +

    - l -

    - o -

    +

    - s -

    +

    - t -

    - u -

    -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/functions_type.html b/trunk/paradiseo-mo/docs/html/functions_type.html index f6d8a269a..ba91d4f42 100644 --- a/trunk/paradiseo-mo/docs/html/functions_type.html +++ b/trunk/paradiseo-mo/docs/html/functions_type.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Typedefs - +
    + +
    +
  • Class Members
    • + +
      @@ -63,8 +65,8 @@ , moHC< M > , moFirstImprSelect< M > -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/functions_vars.html b/trunk/paradiseo-mo/docs/html/functions_vars.html index ee91a2bf4..d433ac1eb 100644 --- a/trunk/paradiseo-mo/docs/html/functions_vars.html +++ b/trunk/paradiseo-mo/docs/html/functions_vars.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Class Members - Variables - +
    + +
    +
  • Class Members
    • + +
    @@ -75,8 +77,8 @@
  • cool_sched : moSA< M >
  • currentSize -: moSimpleMoveTabuList< M > -, moSimpleSolutionTabuList< M > +: moSimpleMoveTabuList< M > +, moSimpleSolutionTabuList< M >

    - f -

    • first_time @@ -103,23 +105,12 @@

    - m -

    @@ -128,9 +119,9 @@ : moHCMoveLoopExpl< M > , moTSMoveLoopExpl< M >
  • num_iter -: moItRandNextMove< M > +: moItRandNextMove< M >
  • numGen -: moGenSolContinue< EOT > +: moGenSolContinue< EOT >

    - q -

    - v -

    -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/hierarchy.html b/trunk/paradiseo-mo/docs/html/hierarchy.html index ec5c44366..6ec579b7d 100644 --- a/trunk/paradiseo-mo/docs/html/hierarchy.html +++ b/trunk/paradiseo-mo/docs/html/hierarchy.html @@ -1,14 +1,14 @@ - + PARADISEO-MO: Hierarchical Index - +
    + +
    + +

    PARADISEO-MO Class Hierarchy

    This inheritance list is sorted roughly, but not completely, alphabetically: +
  • eoBF< M &, const M::EOType &, bool > + [external] +
  • eoBF< M &, const M::EOType &, void > + [external]
  • eoBF< M &, M::EOType::Fitness &, void > [external] -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/index.html b/trunk/paradiseo-mo/docs/html/index.html index bd26c60e9..7a92d1781 100644 --- a/trunk/paradiseo-mo/docs/html/index.html +++ b/trunk/paradiseo-mo/docs/html/index.html @@ -1,8 +1,11 @@ - + PARADISEO-MO + + <a href="main.html">Frames are disabled. Click here to go to the main page.</a> + diff --git a/trunk/paradiseo-mo/docs/html/index_8h-source.html b/trunk/paradiseo-mo/docs/html/index_8h-source.html index 830e3d48c..babc653ce 100644 --- a/trunk/paradiseo-mo/docs/html/index_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/index_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: index.h Source File - +
    + +

    index.h

    00001 
 00022 // coding: iso-8859-1
 00023 // mode: C++
 00024 // c-file-style: "Stroustrup"
 00025 // fill-column: 80
 00026 // End:
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/main.html b/trunk/paradiseo-mo/docs/html/main.html index 555fb636f..a3501ff44 100644 --- a/trunk/paradiseo-mo/docs/html/main.html +++ b/trunk/paradiseo-mo/docs/html/main.html @@ -1,13 +1,13 @@ - + PARADISEO-MO: Welcome to PARADISEO-Moving Objects - +
    + +

    Welcome to PARADISEO-Moving Objects

    0.1

    @@ -32,8 +33,8 @@ tutorial

    install The installation procedure of the package is detailed in the README file in the top-directory of the source-tree.

    design

    -
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_8h-source.html index 874570de1..57e766ce5 100644 --- a/trunk/paradiseo-mo/docs/html/mo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: mo.h Source File - +
    + +

    mo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "mo.h"
@@ -67,8 +68,8 @@
 00044 #include "moTSMoveLoopExpl.h"
 00045 
 00046 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html index 064180fd5..72f19c97b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_algo_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moAlgo.h Source File - +
    + +

    moAlgo.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moAlgo.h"
@@ -38,14 +39,14 @@
 00015 #include <eoOp.h>
 00016 
 00018 
-00021 template < class EOT > class moAlgo:public eoMonOp < EOT >
+00021 template < class EOT > class moAlgo:public eoMonOp < EOT >
 00022 {
 00023 
 00024 };
 00025 
 00026 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html index 42391459d..e8f565985 100644 --- a/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moAspirCrit.h Source File - +
    + +

    moAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moAspirCrit.h"
@@ -38,7 +39,7 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename
+00022 template < class M > class moAspirCrit:public eoBF < const M &, const typename
 00023   M::EOType::Fitness &,
 00024   bool >
 00025 {
@@ -46,13 +47,13 @@
 00027 public:
 00029 
 00032   virtual void
-00033   init () = 0;
+00033   init () = 0;
 00034 
 00035 };
 00036 
 00037 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html index 4e2dc61e2..62c4bb740 100644 --- a/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_best_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moBestImprSelect.h Source File - +
    + +

    moBestImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moBestImprSelect.h"
@@ -38,62 +39,62 @@
 00015 #include "moMoveSelect.h"
 00016 
 00018 
-00022 template < class M > class moBestImprSelect:public moMoveSelect < M >
+00022 template < class M > class moBestImprSelect:public moMoveSelect < M >
 00023 {
 00024 
 00025 public:
 00026 
-00028   typedef typename M::EOType::Fitness Fitness;
+00028   typedef typename M::EOType::Fitness Fitness;
 00029 
-00031   void init (const Fitness & __fit)
+00031   void init (const Fitness & __fit)
 00032   {
 00033 
-00034     first_time = true;
+00034     first_time = true;
 00035   }
 00036 
 00037 
 00039 
-00047   bool update (const M & __move, const Fitness & __fit)
+00047   bool update (const M & __move, const Fitness & __fit)
 00048   {
 00049 
-00050     if (first_time || __fit > best_fit)
+00050     if (first_time || __fit > best_fit)
 00051       {
 00052 
-00053         best_fit = __fit;
-00054         best_move = __move;
+00053         best_fit = __fit;
+00054         best_move = __move;
 00055 
-00056         first_time = false;
+00056         first_time = false;
 00057       }
 00058 
 00059     return true;
 00060   }
 00061 
 00063 
-00068   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
+00068   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
 00069   {
 00070 
-00071     if (!first_time)
+00071     if (!first_time)
 00072       {
-00073         __move = best_move;
-00074         __fit = best_fit;
+00073         __move = best_move;
+00074         __fit = best_fit;
 00075       }
 00076     else
-00077       throw EmptySelection ();
+00077       throw EmptySelection ();
 00078   }
 00079 
 00080 private:
 00081 
-00083   bool first_time;
+00083   bool first_time;
 00084 
-00086   M best_move;
+00086   M best_move;
 00087 
-00089   Fitness best_fit;
+00089   Fitness best_fit;
 00090 
 00091 };
 00092 
 00093 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html index a693cebdf..fe6396a08 100644 --- a/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moCoolingSchedule.h Source File - +
    + +

    moCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moCoolingSchedule.h"
@@ -38,14 +39,14 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 class moCoolingSchedule:public eoUF < double &, bool >
+00022 class moCoolingSchedule:public eoUF < double &, bool >
 00023 {
 00024 
 00025 };
 00026 
 00027 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html index 349e229d0..1bf34de62 100644 --- a/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_exponential_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moExponentialCoolingSchedule.h Source File - +
    + +

    moExponentialCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moExponentialCoolingSchedule.h"
@@ -38,30 +39,30 @@
 00015 #include "moCoolingSchedule.h"
 00016 
 00018 
-00022 class moExponentialCoolingSchedule: public moCoolingSchedule
+00022 class moExponentialCoolingSchedule: public moCoolingSchedule
 00023 {
 00024 
 00025 public:
 00027 
-00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
+00031   moExponentialCoolingSchedule (double __threshold, double __ratio):threshold (__threshold), ratio (__ratio)
 00032   {}
 00033 
 00035 
-00041   bool operator() (double &__temp)
+00041   bool operator() (double &__temp)
 00042   {
-00043     return (__temp *= ratio) > threshold;
+00043     return (__temp *= ratio) > threshold;
 00044   }
 00045 
 00046 private:
 00047 
-00049   double threshold;
+00049   double threshold;
 00050 
-00052   double ratio;
+00052   double ratio;
 00053 };
 00054 
 00055 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html index f233b57c5..dbefb1d43 100644 --- a/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_first_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moFirstImprSelect.h Source File - +
    + +

    moFirstImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moFirstImprSelect.h"
@@ -38,32 +39,32 @@
 00015 #include "moMoveSelect.h"
 00016 
 00018 
-00023 template < class M > class moFirstImprSelect:public moMoveSelect < M >
+00023 template < class M > class moFirstImprSelect:public moMoveSelect < M >
 00024 {
 00025 
 00026 public:
 00027 
-00029   typedef typename M::EOType::Fitness Fitness;
+00029   typedef typename M::EOType::Fitness Fitness;
 00030 
 00032 
-00035   virtual void init (const Fitness & __fit)
+00035   virtual void init (const Fitness & __fit)
 00036   {
 00037 
-00038     valid = false;
-00039     init_fit = __fit;
+00038     valid = false;
+00039     init_fit = __fit;
 00040   }
 00041 
 00042 
 00044 
-00052   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
+00052   bool update (const M & __move, const typename M::EOType::Fitness & __fit)
 00053   {
 00054 
-00055     if (__fit > init_fit)
+00055     if (__fit > init_fit)
 00056       {
 00057 
-00058         best_fit = __fit;
-00059         best_move = __move;
-00060         valid = true;
+00058         best_fit = __fit;
+00059         best_move = __move;
+00060         valid = true;
 00061 
 00062         return false;
 00063       }
@@ -74,33 +75,33 @@
 00068   }
 00069 
 00071 
-00076   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
+00076   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
 00077   {
 00078 
-00079     if (valid)
+00079     if (valid)
 00080       {
-00081         __move = best_move;
-00082         __fit = best_fit;
+00081         __move = best_move;
+00082         __fit = best_fit;
 00083       }
 00084     else
-00085       throw EmptySelection ();
+00085       throw EmptySelection ();
 00086   }
 00087 
 00088 private:
 00089 
-00091   bool valid;
+00091   bool valid;
 00092 
-00094   M best_move;
+00094   M best_move;
 00095 
-00097   Fitness init_fit;
+00097   Fitness init_fit;
 00098 
-00100   Fitness best_fit;
+00100   Fitness best_fit;
 00101 
 00102 };
 00103 
 00104 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html index 5815a7344..fa07e1ecd 100644 --- a/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_gen_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moGenSolContinue.h Source File - +
    + +

    moGenSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "eoGenSolContinue.h"
@@ -38,41 +39,41 @@
 00015 #include "moSolContinue.h"
 00016 
 00018 
-00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
+00021 template < class EOT > class moGenSolContinue:public moSolContinue < EOT >
 00022 {
 00023 
 00024 public:
 00025 
 00027 
-00030   moGenSolContinue (unsigned __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
+00030   moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
 00031   {
 00032 
 00033   }
 00034 
 00036 
-00044   bool operator   () (const EOT & __sol)
+00044   bool operator   () (const EOT & __sol)
 00045   {
 00046 
-00047     return (++numGen < maxNumGen);
+00047     return (++numGen < maxNumGen);
 00048   }
 00049 
 00051 
-00054   void init ()
+00054   void init ()
 00055   {
 00056 
-00057     numGen = 0;
+00057     numGen = 0;
 00058   }
 00059 
 00060 private:
 00061 
-00063   unsigned maxNumGen;
+00063   unsigned int maxNumGen;
 00064 
-00066   unsigned numGen;
+00066   unsigned int numGen;
 00067 };
 00068 
 00069 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html index 640e12dc7..67d3478ac 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moHC.h Source File - +
    + +

    moHC.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moHC.h"
@@ -43,47 +44,47 @@
 00020 #include "moHCMoveLoopExpl.h"
 00021 
 00023 
-00026 template < class M > class moHC:public moAlgo < typename M::EOType >
+00026 template < class M > class moHC:public moAlgo < typename M::EOType >
 00027 {
 00028 
 00030   typedef
 00031     typename
 00032     M::EOType
-00033     EOT;
+00033     EOT;
 00034 
 00036   typedef
 00037     typename
 00038     EOT::Fitness
-00039     Fitness;
+00039     Fitness;
 00040 
 00041 public:
 00042 
 00044 
-00053 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
+00053 moHC (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select, eoEvalFunc < EOT > &__full_eval):move_expl (*new moHCMoveLoopExpl < M >
 00054              (__move_init, __next_move, __incr_eval, __move_select)),
-00055     full_eval (__full_eval)
+00055     full_eval (__full_eval)
 00056   {
 00057 
 00058   }
 00059 
 00061 
-00067 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00068     full_eval
+00067 moHC (moMoveExpl < M > &__move_expl, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00068     full_eval
 00069     (__full_eval)
 00070   {
 00071 
 00072   }
 00073 
 00075 
-00082   bool operator   ()(EOT & __sol)
+00082   bool operator   ()(EOT & __sol)
 00083   {
 00084 
 00085     if (__sol.invalid ())
 00086       {
-00087         full_eval (__sol);
+00087         full_eval (__sol);
 00088       }
 00089 
-00090     EOT new_sol;
+00090     EOT new_sol;
 00091 
 00092     do
 00093       {
@@ -93,10 +94,10 @@
 00097         try
 00098         {
 00099 
-00100           move_expl (__sol, new_sol);
+00100           move_expl (__sol, new_sol);
 00101 
 00102         }
-00103         catch (EmptySelection & __ex)
+00103         catch (EmptySelection & __ex)
 00104         {
 00105 
 00106           break;
@@ -119,14 +120,14 @@
 00123 
 00124 private:
 00125 
-00127   moMoveExpl < M > &move_expl;
+00127   moMoveExpl < M > &move_expl;
 00128 
-00130   eoEvalFunc < EOT > &full_eval;
+00130   eoEvalFunc < EOT > &full_eval;
 00131 };
 00132 
 00133 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html index eae92467a..a210367a3 100644 --- a/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_h_c_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moHCMoveLoopExpl.h Source File - +
    + +

    moHCMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moHCMoveLoopExpl.h"
@@ -42,53 +43,53 @@
 00019 #include "moMoveIncrEval.h"
 00020 #include "moMoveSelect.h"
 00021 
-00023 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
+00023 template < class M > class moHCMoveLoopExpl:public moMoveLoopExpl < M >
 00024 {
 00025 
-00027   typedef typename M::EOType EOT;
+00027   typedef typename M::EOType EOT;
 00028 
-00030   typedef typename M::EOType::Fitness Fitness;
+00030   typedef typename M::EOType::Fitness Fitness;
 00031 
 00032 public:
 00033 
 00035 
-00043 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
+00043 moHCMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moMoveSelect < M > &__move_select):
 00044 
-00045   move_init (__move_init),
-00046     next_move (__next_move),
-00047     incr_eval (__incr_eval), move_select (__move_select)
+00045   move_init (__move_init),
+00046     next_move (__next_move),
+00047     incr_eval (__incr_eval), move_select (__move_select)
 00048   {
 00049 
 00050   }
 00051 
 00053 
-00059   void operator   () (const EOT & __old_sol, EOT & __new_sol)
+00059   void operator   () (const EOT & __old_sol, EOT & __new_sol)
 00060   {
 00061 
 00062     M move;
 00063 
 00064     //
-00065     move_init (move, __old_sol);        /* Restarting the exploration of 
+00065     move_init (move, __old_sol);        /* Restarting the exploration of 
 00066                                            of the neighborhood ! */
 00067 
-00068     move_select.init (__old_sol.fitness ());
+00068     move_select.init (__old_sol.fitness ());
 00069 
-00070     while (move_select.update (move, incr_eval (move, __old_sol))
-00071            && next_move (move, __old_sol));
+00070     while (move_select.update (move, incr_eval (move, __old_sol))
+00071            && next_move (move, __old_sol));
 00072 
 00073     try
 00074     {
 00075 
 00076       M best_move;
 00077 
-00078       Fitness best_move_fit;
+00078       Fitness best_move_fit;
 00079 
-00080       move_select (best_move, best_move_fit);
+00080       move_select (best_move, best_move_fit);
 00081       __new_sol.fitness (best_move_fit);
 00082       best_move (__new_sol);
 00083 
 00084     }
-00085     catch (EmptySelection & __ex)
+00085     catch (EmptySelection & __ex)
 00086     {
 00087 
 00088       // ?
@@ -97,19 +98,19 @@
 00091 
 00092 private:
 00093 
-00095   moMoveInit < M > &move_init;
+00095   moMoveInit < M > &move_init;
 00096 
-00098   moNextMove < M > &next_move;
+00098   moNextMove < M > &next_move;
 00099 
-00101   moMoveIncrEval < M > &incr_eval;
+00101   moMoveIncrEval < M > &incr_eval;
 00102 
-00104   moMoveSelect < M > &move_select;
+00104   moMoveSelect < M > &move_select;
 00105 
 00106 };
 00107 
 00108 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html index 88abbd1cf..44261fa0a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_impr_best_fit_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moImprBestFitAspirCrit.h Source File - +
    + +

    moImprBestFitAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moImprAspirCrit.h"
@@ -38,44 +39,44 @@
 00015 #include "moAspirCrit.h"
 00016 
 00018 
-00022 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
+00022 template < class M > class moImprBestFitAspirCrit:public moAspirCrit < M >
 00023 {
 00024 
 00025 public:
 00026 
-00028   typedef typename M::EOType::Fitness Fitness;
+00028   typedef typename M::EOType::Fitness Fitness;
 00029 
-00031   moImprBestFitAspirCrit ()
+00031   moImprBestFitAspirCrit ()
 00032   {
 00033 
-00034     first_time = true;
+00034     first_time = true;
 00035   }
 00036 
-00038   void init ()
+00038   void init ()
 00039   {
 00040 
-00041     first_time = true;
+00041     first_time = true;
 00042   }
 00043 
 00045 
-00052   bool operator   () (const M & __move, const Fitness & __fit)
+00052   bool operator   () (const M & __move, const Fitness & __fit)
 00053   {
 00054 
-00055     if (first_time)
+00055     if (first_time)
 00056       {
 00057 
-00058         best_fit = __fit;
-00059         first_time = false;
+00058         best_fit = __fit;
+00059         first_time = false;
 00060 
 00061         return true;
 00062       }
-00063     else if (__fit < best_fit)
+00063     else if (__fit < best_fit)
 00064       return false;
 00065 
 00066     else
 00067       {
 00068 
-00069         best_fit = __fit;
+00069         best_fit = __fit;
 00070 
 00071         return true;
 00072       }
@@ -83,14 +84,14 @@
 00074 
 00075 private:
 00076 
-00078   Fitness best_fit;
+00078   Fitness best_fit;
 00079 
-00081   bool first_time;
+00081   bool first_time;
 00082 };
 00083 
 00084 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html index 79a0171c2..36ea566b9 100644 --- a/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_it_rand_next_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moItRandNextMove.h Source File - +
    + +

    moItRandNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moNextMove.h"
@@ -39,54 +40,54 @@
 00016 #include "moRandMove.h"
 00017 
 00019 
-00022 template < class M > class moItRandNextMove:public moNextMove < M >
+00022 template < class M > class moItRandNextMove:public moNextMove < M >
 00023 {
 00024 
-00026   typedef typename M::EOType EOT;
+00026   typedef typename M::EOType EOT;
 00027 
 00028 public:
 00029 
 00031 
-00037   moItRandNextMove (moRandMove < M > &__rand_move,
-00038                     unsigned __max_iter):rand_move (__rand_move),
-00039     max_iter (__max_iter), num_iter (0)
+00037   moItRandNextMove (moRandMove < M > &__rand_move,
+00038                     unsigned int __max_iter):rand_move (__rand_move),
+00039     max_iter (__max_iter), num_iter (0)
 00040   {
 00041 
 00042   }
 00043 
 00045 
-00052   bool operator   () (M & __move, const EOT & __sol)
+00052   bool operator   () (M & __move, const EOT & __sol)
 00053   {
 00054 
-00055     if (num_iter++ > max_iter)
+00055     if (num_iter++ > max_iter)
 00056       {
 00057 
-00058         num_iter = 0;
+00058         num_iter = 0;
 00059         return false;
 00060       }
 00061     else
 00062       {
 00063 
 00064         /* The given solution is discarded here */
-00065         rand_move (__move);
-00066         num_iter++;
+00065         rand_move (__move);
+00066         num_iter++;
 00067         return true;
 00068       }
 00069   }
 00070 
 00071 private:
 00072 
-00074   moRandMove < M > &rand_move;
+00074   moRandMove < M > &rand_move;
 00075 
-00077   unsigned max_iter;
+00077   unsigned int max_iter;
 00078 
-00080   unsigned num_iter;
+00080   unsigned int num_iter;
 00081 
 00082 };
 00083 
 00084 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html index 2ce11af1c..a71812224 100644 --- a/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_l_s_check_point_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moLSCheckPoint.h Source File - +
    + +

    moLSCheckPoint.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moLSCheckPoint.h"
@@ -38,28 +39,28 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
+00021 template < class M > class moLSCheckPoint:public eoBF < const M &, const typename
 00022   M::EOType &, void >
 00023 {
 00024 
 00025 public:
 00027 
 00033   void
-00034   operator   () (const M & __move, const typename M::EOType & __sol)
+00034   operator   () (const M & __move, const typename M::EOType & __sol)
 00035   {
 00036 
-00037     for (unsigned i = 0; i < func.size (); i++)
+00037     for (unsigned int i = 0; i < func.size (); i++)
 00038       {
-00039         func[i]->operator   ()(__move, __sol);
+00039         func[i]->operator   ()(__move, __sol);
 00040       }
 00041   }
 00042 
 00044 
 00048   void
-00049   add (eoBF < const M &, const typename M::EOType &, void >&__f)
+00049   add (eoBF < const M &, const typename M::EOType &, void >&__f)
 00050   {
 00051 
-00052     func.push_back (&__f);
+00052     func.push_back (&__f);
 00053   }
 00054 
 00055 private:
@@ -68,13 +69,13 @@
 00059     M &, const
 00060     typename
 00061   M::EOType &, void >*>
-00062     func;
+00062     func;
 00063 
 00064 };
 00065 
 00066 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html index 3fc1ebc8b..45a5fefed 100644 --- a/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_linear_cooling_schedule_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moLinearCoolingSchedule.h Source File - +
    + +

    moLinearCoolingSchedule.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moLinearCoolingSchedule.h"
@@ -38,30 +39,30 @@
 00015 #include "moCoolingSchedule.h"
 00016 
 00018 
-00022 class moLinearCoolingSchedule: public moCoolingSchedule
+00022 class moLinearCoolingSchedule: public moCoolingSchedule
 00023 {
 00024 
 00025 public:
 00027 
-00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
+00031   moLinearCoolingSchedule (double __threshold, double __quantity):threshold (__threshold), quantity (__quantity)
 00032   {}
 00033 
 00035 
-00041   bool operator() (double &__temp)
+00041   bool operator() (double &__temp)
 00042   {
-00043     return (__temp -= quantity) > threshold;
+00043     return (__temp -= quantity) > threshold;
 00044   }
 00045 
 00046 private:
 00047 
-00049   double threshold;
+00049   double threshold;
 00050 
-00052   double quantity;
+00052   double quantity;
 00053 };
 00054 
 00055 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html index 4d5340890..c8f201411 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMove.h Source File - +
    + +

    moMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moMove.h"
@@ -38,17 +39,17 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00023 template < class EOT > class moMove:public eoUF < EOT &, void >
+00023 template < class EOT > class moMove:public eoUF < EOT &, void >
 00024 {
 00025 
 00026 public:
-00028   typedef EOT EOType;
+00028   typedef EOT EOType;
 00029 
 00030 };
 00031 
 00032 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html index c9f2dca94..981b11d81 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveExpl.h Source File - +
    + +

    moMoveExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "eoMoveExpl.h"
@@ -38,7 +39,7 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00021 template < class M > class moMoveExpl:public eoBF < const typename
+00021 template < class M > class moMoveExpl:public eoBF < const typename
 00022   M::EOType &,
 00023   typename
 00024 M::EOType &, void >
@@ -47,8 +48,8 @@
 00027 };
 00028 
 00029 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html index a68ad9e88..1089cf82a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_incr_eval_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveIncrEval.h Source File - +
    + +

    moMoveIncrEval.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "eoMoveIncrEval.h"
@@ -38,7 +39,7 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
+00024 template < class M > class moMoveIncrEval:public eoBF < const M &, const typename
 00025   M::EOType &,
 00026   typename
 00027   M::EOType::Fitness >
@@ -47,8 +48,8 @@
 00030 };
 00031 
 00032 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html index c47041695..52d3f71e8 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_init_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveInit.h Source File - +
    + +

    moMoveInit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moMoveInit.h"
@@ -38,15 +39,15 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 template < class M > class moMoveInit:public eoBF < M &, const typename
+00022 template < class M > class moMoveInit:public eoBF < M &, const typename
 00023 M::EOType &, void >
 00024 {
 00025 
 00026 };
 00027 
 00028 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html index 0b424a87f..0f131d32e 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveLoopExpl.h Source File - +
    + +

    moMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moMoveLoopExpl.h"
@@ -38,14 +39,14 @@
 00015 #include "moMoveExpl.h"
 00016 
 00018 
-00021 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
+00021 template < class M > class moMoveLoopExpl:public moMoveExpl < M >
 00022 {
 00023 
 00024 };
 00025 
 00026 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html index f337882d7..d5bf6c12a 100644 --- a/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_move_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moMoveSelect.h Source File - +
    + +

    moMoveSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moMoveSelect.h"
@@ -38,35 +39,35 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00021 class EmptySelection
+00021 class EmptySelection
 00022 {
 00023 
 00024 };
 00025 
 00027 
-00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &,
+00032 template < class M > class moMoveSelect:public eoBF < M &, typename M::EOType::Fitness &,
 00033   void >
 00034 {
 00035 public:
 00037   typedef
 00038     typename
 00039     M::EOType::Fitness
-00040     Fitness;
+00040     Fitness;
 00041 
 00043 
 00050   virtual void
-00051   init (const Fitness & __fit) = 0;
+00051   init (const Fitness & __fit) = 0;
 00052 
 00054 
 00059   virtual
 00060     bool
-00061   update (const M & __move, const Fitness & __fit) = 0;
+00061   update (const M & __move, const Fitness & __fit) = 0;
 00062 
 00063 };
 00064 
 00065 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html index dc9c2e1c1..e2e80de75 100644 --- a/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_next_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moNextMove.h Source File - +
    + +

    moNextMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moNextMove.h"
@@ -38,7 +39,7 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 template < class M > class moNextMove:public eoBF < M &, const typename
+00022 template < class M > class moNextMove:public eoBF < M &, const typename
 00023   M::EOType &,
 00024   bool >
 00025 {
@@ -46,8 +47,8 @@
 00027 };
 00028 
 00029 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html index 82442a5cd..59d3208dd 100644 --- a/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_no_aspir_crit_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moNoAspirCrit.h Source File - +
    + +

    moNoAspirCrit.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "eoNoAspirCrit.h"
@@ -38,11 +39,11 @@
 00015 #include "moAspirCrit.h"
 00016 
 00018 
-00021 template < class M > class moNoAspirCrit:public moAspirCrit < M >
+00021 template < class M > class moNoAspirCrit:public moAspirCrit < M >
 00022 {
 00023 
 00025 
-00032   bool operator   () (const M & __move,
+00032   bool operator   () (const M & __move,
 00033                       const typename M::EOType::Fitness & __sol)
 00034   {
 00035 
@@ -50,14 +51,14 @@
 00037   }
 00038 
 00040 
-00043   void init ()
+00043   void init ()
 00044   {
 00045   }
 00046 };
 00047 
 00048 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html index d4a0dd77c..e75f059e8 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_impr_select_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moRandImprSelect.h Source File - +
    + +

    moRandImprSelect.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moRandImprSelect.h"
@@ -41,63 +42,63 @@
 00018 #include "moMoveSelect.h"
 00019 
 00021 
-00025 template < class M > class moRandImprSelect:public moMoveSelect < M >
+00025 template < class M > class moRandImprSelect:public moMoveSelect < M >
 00026 {
 00027 
 00028 public:
 00029 
-00031   typedef typename M::EOType::Fitness Fitness;
+00031   typedef typename M::EOType::Fitness Fitness;
 00032 
 00034 
-00040   void init (const Fitness & __fit)
+00040   void init (const Fitness & __fit)
 00041   {
-00042     init_fit = __fit;
-00043     vect_better_fit.clear ();
-00044     vect_better_moves.clear ();
+00042     init_fit = __fit;
+00043     vect_better_fit.clear ();
+00044     vect_better_moves.clear ();
 00045   }
 00046 
 00048 
-00056   bool update (const M & __move, const Fitness & __fit)
+00056   bool update (const M & __move, const Fitness & __fit)
 00057   {
 00058 
-00059     if (__fit > init_fit)
+00059     if (__fit > init_fit)
 00060       {
 00061 
-00062         vect_better_fit.push_back (__fit);
-00063         vect_better_moves.push_back (__move);
+00062         vect_better_fit.push_back (__fit);
+00063         vect_better_moves.push_back (__move);
 00064       }
 00065 
 00066     return true;
 00067   }
 00068 
 00070 
-00077   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
+00077   void operator   () (M & __move, Fitness & __fit) throw (EmptySelection)
 00078   {
 00079 
-00080     if (!vect_better_fit.empty ())
+00080     if (!vect_better_fit.empty ())
 00081       {
 00082 
-00083         unsigned n = rng.random (vect_better_fit.size ());
+00083         unsigned n = rng.random (vect_better_fit.size ());
 00084 
-00085         __move = vect_better_moves[n];
-00086         __fit = vect_better_fit[n];
+00085         __move = vect_better_moves[n];
+00086         __fit = vect_better_fit[n];
 00087       }
 00088     else
-00089       throw EmptySelection ();
+00089       throw EmptySelection ();
 00090   }
 00091 
 00092 private:
 00093 
-00095   Fitness init_fit;
+00095   Fitness init_fit;
 00096 
-00098   std::vector < Fitness > vect_better_fit;
+00098   std::vector < Fitness > vect_better_fit;
 00099 
-00101   std::vector < M > vect_better_moves;
+00101   std::vector < M > vect_better_moves;
 00102 };
 00103 
 00104 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html index 8387475b8..a8f35fe6b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_rand_move_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moRandMove.h Source File - +
    + +

    moRandMove.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moRandMove.h"
@@ -38,14 +39,14 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00021 template < class M > class moRandMove:public eoUF < M &, void >
+00021 template < class M > class moRandMove:public eoUF < M &, void >
 00022 {
 00023 
 00024 };
 00025 
 00026 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html index f5de49627..e8b582f3b 100644 --- a/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_s_a_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSA.h Source File - +
    + +

    moSA.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSA.h"
@@ -49,106 +50,104 @@
 00026 #include <math.h>
 00027 
 00029 
-00032 template < class M > class moSA:public moAlgo < typename M::EOType >
+00032 template < class M > class moSA:public moAlgo < typename M::EOType >
 00033 {
 00034 
 00036   typedef
 00037     typename
 00038     M::EOType
-00039     EOT;
+00039     EOT;
 00040 
 00042   typedef
 00043     typename
 00044     EOT::Fitness
-00045     Fitness;
+00045     Fitness;
 00046 
 00047 public:
 00048 
 00050 
-00060   moSA (moRandMove < M > &__move_rand,
+00060   moSA (moRandMove < M > &__move_rand,
 00061         moMoveIncrEval < M > &__incr_eval,
 00062         moSolContinue < EOT > &__cont,
 00063         double __init_temp,
-00064         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
-00065   move_rand (__move_rand),
-00066   incr_eval (__incr_eval),
-00067   cont (__cont),
-00068   init_temp (__init_temp),
-00069   cool_sched (__cool_sched),
-00070   full_eval (__full_eval)
+00064         moCoolingSchedule & __cool_sched, eoEvalFunc < EOT > &__full_eval):
+00065   move_rand (__move_rand),
+00066   incr_eval (__incr_eval),
+00067   cont (__cont),
+00068   init_temp (__init_temp),
+00069   cool_sched (__cool_sched),
+00070   full_eval (__full_eval)
 00071   {
 00072 
 00073   }
 00074 
 00076 
-00082   bool operator   ()(EOT & __sol)
+00082   bool operator   ()(EOT & __sol)
 00083   {
 00084 
 00085     if (__sol.invalid ())
 00086       {
-00087         full_eval (__sol);
+00087         full_eval (__sol);
 00088       }
 00089 
-00090     double
-00091       temp = init_temp;
-00092 
-00093     M move;
-00094 
-00095     EOT best_sol = __sol;
-00096 
-00097     do
-00098       {
-00099 
-00100         cont.init ();
-00101         do
-00102           {
-00103 
-00104             move_rand (move);
-00105 
-00106             Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness ();
-00107 
-00108             if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp))
-00109               {
-00110 
-00111                 __sol.fitness (incr_eval (move, __sol));
-00112                 move (__sol);
-00113 
-00114                 /* Updating the best solution found
-00115                    until now ? */
-00116                 if (__sol.fitness () > best_sol.fitness ())
-00117                   best_sol = __sol;
-00118               }
-00119 
-00120           }
-00121         while (cont (__sol));
-00122 
-00123       }
-00124     while (cool_sched (temp));
-00125 
-00126     __sol = best_sol;
-00127 
-00128     return true;
-00129   }
-00130 
-00131 private:
-00132 
-00134   moRandMove < M > &move_rand;
-00135 
-00137   moMoveIncrEval < M > &incr_eval;
-00138 
-00140   moSolContinue < EOT > &cont;
-00141 
-00143   double
-00144     init_temp;
-00145 
-00147   moCoolingSchedule & cool_sched;
-00148 
-00150   eoEvalFunc < EOT > &full_eval;        // Full evaluator.
-00151 };
-00152 
-00153 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +00090 double temp = init_temp; +00091 +00092 M move; +00093 +00094 EOT best_sol = __sol; +00095 +00096 do +00097 { +00098 +00099 cont.init (); +00100 do +00101 { +00102 +00103 move_rand (move); +00104 +00105 Fitness delta_fit = incr_eval (move, __sol) - __sol.fitness (); +00106 +00107 if (delta_fit > 0 || rng.uniform () < exp (delta_fit / temp)) +00108 { +00109 +00110 __sol.fitness (incr_eval (move, __sol)); +00111 move (__sol); +00112 +00113 /* Updating the best solution found +00114 until now ? */ +00115 if (__sol.fitness () > best_sol.fitness ()) +00116 best_sol = __sol; +00117 } +00118 +00119 } +00120 while (cont (__sol)); +00121 +00122 } +00123 while (cool_sched (temp)); +00124 +00125 __sol = best_sol; +00126 +00127 return true; +00128 } +00129 +00130 private: +00131 +00133 moRandMove < M > &move_rand; +00134 +00136 moMoveIncrEval < M > &incr_eval; +00137 +00139 moSolContinue < EOT > &cont; +00140 +00142 double init_temp; +00143 +00145 moCoolingSchedule & cool_sched; +00146 +00148 eoEvalFunc < EOT > &full_eval; // Full evaluator. +00149 }; +00150 +00151 #endif +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html index e2cef61b8..db6a49273 100644 --- a/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_simple_move_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSimpleMoveTabuList.h Source File - +
    + +

    moSimpleMoveTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSimpleMoveTabuList.h"
@@ -41,66 +42,66 @@
 00018 #include "moTabuList.h"
 00019 
 00021 template <class M>
-00022 class moSimpleMoveTabuList: public moTabuList < M >
+00022 class moSimpleMoveTabuList: public moTabuList < M >
 00023 {
 00024   
 00025 public:
 00026   
-00028   typedef typename M::EOType EOT;
+00028   typedef typename M::EOType EOT;
 00029 
 00031   /*
 00032     \param __size The maximum size of the move tabu list.
 00033    */
-00034   moSimpleMoveTabuList(unsigned __size): maxSize(__size)
+00034   moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
 00035   {
-00036     currentSize=0;
+00036     currentSize=0;
 00037   }
 00038 
 00040 
 00045   bool
-00046   operator () (const M & __move, const EOT & __sol) 
+00046   operator () (const M & __move, const EOT & __sol) 
 00047   {
 00048     typename std::list<M>::iterator it;
 00049     
-00050     it=tabuList.begin();
-00051     while(it!=tabuList.end()&&(!((*it)==__move)))
+00050     it=tabuList.begin();
+00051     while(it!=tabuList.end()&&(!((*it)==__move)))
 00052       {
 00053         it++;
 00054       }
 00055     
-00056     return it!=tabuList.end();
+00056     return it!=tabuList.end();
 00057   }
 00058   
 00059   void
-00060   add (const M & __move, const EOT & __sol)
+00060   add (const M & __move, const EOT & __sol)
 00061   {
-00062     if(currentSize!=0)
+00062     if(currentSize!=0)
 00063       {
 00064         // Useful in the case of a move has been kept thanks to the moAspirCrit.
 00065         // In this case, the move can already be in the tabuList.
-00066         removeMove(__move);
+00066         removeMove(__move);
 00067       }
 00068 
-00069     tabuList.push_back(__move);
+00069     tabuList.push_back(__move);
 00070     
-00071     if(currentSize==maxSize)
+00071     if(currentSize==maxSize)
 00072       {
-00073         tabuList.erase(tabuList.begin());
+00073         tabuList.erase(tabuList.begin());
 00074       }
 00075     else
 00076       {
-00077         currentSize++;
+00077         currentSize++;
 00078       }
 00079   }
 00080   
 00081   void
-00082   update ()
+00082   update ()
 00083   {
 00084     //nothing to do
 00085   }
 00086 
 00087   void
-00088   init ()
+00088   init ()
 00089   {
 00090     //nothing to do
 00091   }
@@ -109,32 +110,32 @@
 00094   
 00096 
 00099   void
-00100   removeMove(const M & __move)
+00100   removeMove(const M & __move)
 00101   {
 00102     typename std::list<M>::iterator it;
 00103     
-00104     it=tabuList.begin();
-00105     while(it!=tabuList.end()&&(!((*it)==__move)))
+00104     it=tabuList.begin();
+00105     while(it!=tabuList.end()&&(!((*it)==__move)))
 00106       {
 00107         it++;
 00108       }
 00109 
-00110     if(it!=tabuList.end())
+00110     if(it!=tabuList.end())
 00111       {
-00112         tabuList.erase(it);
+00112         tabuList.erase(it);
 00113       }
 00114   }
 00115 
-00117   unsigned maxSize;
+00117   unsigned int maxSize;
 00118 
-00120   unsigned currentSize;
+00120   unsigned int currentSize;
 00121   
-00123   std::list<M> tabuList;
+00123   std::list<M> tabuList;
 00124 };
 00125 
 00126 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html index d05a59314..386ed43ad 100644 --- a/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_simple_solution_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSimpleSolutionTabuList.h Source File - +
    + +

    moSimpleSolutionTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSimpleSolutionTabuList.h"
@@ -41,73 +42,73 @@
 00018 #include "moTabuList.h"
 00019 
 00021 template <class M>
-00022 class moSimpleSolutionTabuList: public moTabuList < M >
+00022 class moSimpleSolutionTabuList: public moTabuList < M >
 00023 {
 00024   
 00025 public:
 00026 
-00028   typedef typename M::EOType EOT;
+00028   typedef typename M::EOType EOT;
 00029   
 00031 
-00034   moSimpleSolutionTabuList(unsigned __size): maxSize(__size)
+00034   moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
 00035   {
-00036     currentSize=0;
+00036     currentSize=0;
 00037   }
 00038   
 00040 
-00045   bool operator () (const M & __move, const EOT & __sol) 
+00045   bool operator () (const M & __move, const EOT & __sol) 
 00046   {
 00047     typename std::list<EOT>::iterator it;
 00048   
 00049     M _move=(M)__move;
-00050     EOT _sol=(EOT) __sol;
+00050     EOT _sol=(EOT) __sol;
 00051 
 00052     _move(_sol);
 00053   
-00054     it=tabuList.begin();
-00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
+00054     it=tabuList.begin();
+00055     while(it!=tabuList.end()&&(!((*it)==_sol)))
 00056       {
 00057         it++;
 00058       }
 00059     
-00060     return it!=tabuList.end();
+00060     return it!=tabuList.end();
 00061   }
 00062   
 00063   void
-00064   add (const M & __move, const EOT & __sol)
+00064   add (const M & __move, const EOT & __sol)
 00065   {
 00066     M _move=(M)__move;
-00067     EOT _sol=(EOT) _sol;
+00067     EOT _sol=(EOT) _sol;
 00068     
 00069     _move(_sol);
 00070 
-00071     if(currentSize!=0)
+00071     if(currentSize!=0)
 00072       {
 00073         // Useful in the case of a solution has been kept thanks to the moAspirCrit.
 00074         // In this case, the solution can already be in the tabuList.
-00075         removeSolution(_sol);
+00075         removeSolution(_sol);
 00076       }
 00077     
-00078     tabuList.push_back(_sol);
+00078     tabuList.push_back(_sol);
 00079     
-00080     if(currentSize==maxSize)
+00080     if(currentSize==maxSize)
 00081       {
-00082         tabuList.erase(tabuList.begin());
+00082         tabuList.erase(tabuList.begin());
 00083       }
 00084     else
 00085       {
-00086         currentSize++;
+00086         currentSize++;
 00087       }
 00088   }
 00089 
 00090   void
-00091   update ()
+00091   update ()
 00092   {
 00093     //nothing to do
 00094   }
 00095 
 00096   void
-00097   init ()
+00097   init ()
 00098   {
 00099     //nothing to do
 00100   }
@@ -116,32 +117,32 @@
 00103 
 00105 
 00108   void
-00109   removeSolution(const EOT & __sol)
+00109   removeSolution(const EOT & __sol)
 00110   {
 00111     typename std::list<EOT>::iterator it;
 00112 
-00113     it=tabuList.begin();
-00114     while(it!=tabuList.end()&&(!((*it)==__sol)))
+00113     it=tabuList.begin();
+00114     while(it!=tabuList.end()&&(!((*it)==__sol)))
 00115       {
 00116         it++;
 00117       }
 00118 
-00119     if(it!=tabuList.end())
+00119     if(it!=tabuList.end())
 00120       {
-00121         tabuList.erase(it);
+00121         tabuList.erase(it);
 00122       }
 00123   }
 00124   
-00126   unsigned maxSize;
+00126   unsigned int maxSize;
 00127 
-00129   unsigned currentSize;
+00129   unsigned int currentSize;
 00130   
-00132   std::list<EOT> tabuList;
+00132   std::list<EOT> tabuList;
 00133 };
 00134 
 00135 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html index 4fa05d920..42af79f2c 100644 --- a/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_sol_continue_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moSolContinue.h Source File - +
    + +

    moSolContinue.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moSolContinue.h"
@@ -38,17 +39,17 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
+00022 template < class EOT > class moSolContinue:public eoUF < const EOT &, bool >
 00023 {
 00024 
 00025 public:
 00027 
-00030   virtual void init () = 0;
+00030   virtual void init () = 0;
 00031 };
 00032 
 00033 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html index 75d6e265e..355cb3f45 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTS.h Source File - +
    + +

    moTS.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moTS.h"
@@ -47,67 +48,67 @@
 00024 #include <pthread.h>
 00025 
 00027 
-00030 template < class M > class moTS:public moAlgo < typename M::EOType >
+00030 template < class M > class moTS:public moAlgo < typename M::EOType >
 00031 {
 00032 
 00034   typedef
 00035     typename
 00036     M::EOType
-00037     EOT;
+00037     EOT;
 00038 
 00040   typedef
 00041     typename
 00042     EOT::Fitness
-00043     Fitness;
+00043     Fitness;
 00044 
 00045 public:
 00046 
 00048 
-00059 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
+00059 moTS (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (*new moTSMoveLoopExpl < M >
 00060              (__move_init, __next_move, __incr_eval, __tabu_list,
-00061               __aspir_crit)), cont (__cont), full_eval (__full_eval)
+00061               __aspir_crit)), cont (__cont), full_eval (__full_eval)
 00062   {
 00063 
-00064     if (first_time)
+00064     if (first_time)
 00065       {
 00066 
-00067         pthread_mutex_init (&mutex, 0);
+00067         pthread_mutex_init (&mutex, 0);
 00068 
-00069         first_time = false;
+00069         first_time = false;
 00070       }
 00071   }
 00072 
 00074 
-00081 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
-00082     cont (__cont),
-00083     full_eval (__full_eval)
+00081 moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < EOT > &__full_eval):move_expl (__move_expl),
+00082     cont (__cont),
+00083     full_eval (__full_eval)
 00084   {
 00085 
-00086     if (first_time)
+00086     if (first_time)
 00087       {
 00088 
-00089         pthread_mutex_init (&mutex, 0);
+00089         pthread_mutex_init (&mutex, 0);
 00090 
-00091         first_time = false;
+00091         first_time = false;
 00092       }
 00093   }
 00094 
 00096 
-00104   bool operator   ()(EOT & __sol)
+00104   bool operator   ()(EOT & __sol)
 00105   {
 00106 
-00107     pthread_mutex_lock (&mutex);
+00107     pthread_mutex_lock (&mutex);
 00108 
 00109     if (__sol.invalid ())
 00110       {
-00111         full_eval (__sol);
+00111         full_eval (__sol);
 00112       }
 00113 
 00114     M move;
 00115 
-00116     EOT best_sol = __sol, new_sol;
+00116     EOT best_sol = __sol, new_sol;
 00117 
-00118     cont.init ();
+00118     cont.init ();
 00119 
 00120     do
 00121       {
@@ -117,10 +118,10 @@
 00125         try
 00126         {
 00127 
-00128           move_expl (__sol, new_sol);
+00128           move_expl (__sol, new_sol);
 00129 
 00130         }
-00131         catch (EmptySelection & __ex)
+00131         catch (EmptySelection & __ex)
 00132         {
 00133 
 00134           break;
@@ -136,39 +137,35 @@
 00144         __sol = new_sol;
 00145 
 00146       }
-00147     while (cont (__sol));
+00147     while (cont (__sol));
 00148 
 00149     __sol = best_sol;
 00150 
-00151     pthread_mutex_unlock (&mutex);
+00151     pthread_mutex_unlock (&mutex);
 00152 
 00153     return true;
 00154   }
 00155 
 00156 private:
 00157 
-00159   static
-00160     bool
-00161     first_time;
-00162 
-00164   static
-00165     pthread_mutex_t
-00166     mutex;
-00167 
-00169   moMoveExpl < M > &move_expl;
-00170 
-00172   moSolContinue < EOT > &cont;
+00159   static bool first_time;
+00160 
+00162   static  pthread_mutex_t  mutex;
+00163 
+00165   moMoveExpl < M > &move_expl;
+00166 
+00168   moSolContinue < EOT > &cont;
+00169 
+00171   eoEvalFunc < EOT > &full_eval;
+00172 };
 00173 
-00175   eoEvalFunc < EOT > &full_eval;
-00176 };
-00177 
-00179 template < class EOT > pthread_mutex_t moTS < EOT >::mutex;
-00180 
-00182 template < class EOT > bool moTS < EOT >::first_time = true;
-00183 
-00184 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +00175 template < class EOT > pthread_mutex_t moTS < EOT >::mutex; +00176 +00178 template < class EOT > bool moTS < EOT >::first_time = true; +00179 +00180 #endif +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html index c492aec14..8e0d6f292 100644 --- a/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_t_s_move_loop_expl_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTSMoveLoopExpl.h Source File - +
    + +

    moTSMoveLoopExpl.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moTSMoveLoopExpl.h"
@@ -47,88 +48,88 @@
 00024 #include "moBestImprSelect.h"
 00025 
 00027 
-00030 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
+00030 template < class M > class moTSMoveLoopExpl:public moMoveLoopExpl < M >
 00031 {
 00032 
-00034   typedef typename M::EOType EOT;
+00034   typedef typename M::EOType EOT;
 00035 
-00037   typedef typename M::EOType::Fitness Fitness;
+00037   typedef typename M::EOType::Fitness Fitness;
 00038 
 00039 public:
 00040 
 00042 
-00049 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
-00050   move_init (__move_init),
-00051     next_move (__next_move),
-00052     incr_eval (__incr_eval),
-00053     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
+00049 moTSMoveLoopExpl (moMoveInit < M > &__move_init, moNextMove < M > &__next_move, moMoveIncrEval < M > &__incr_eval, moTabuList < M > &__tabu_list, moAspirCrit < M > &__aspir_crit):
+00050   move_init (__move_init),
+00051     next_move (__next_move),
+00052     incr_eval (__incr_eval),
+00053     tabu_list (__tabu_list), aspir_crit (__aspir_crit)
 00054   {
 00055 
-00056     tabu_list.init ();
-00057     aspir_crit.init ();
+00056     tabu_list.init ();
+00057     aspir_crit.init ();
 00058   }
 00059 
 00061 
-00069   void operator   () (const EOT & __old_sol, EOT & __new_sol)
+00069   void operator   () (const EOT & __old_sol, EOT & __new_sol)
 00070   {
 00071 
 00072     M move;
 00073 
 00074 
-00075     move_init (move, __old_sol);        /* Restarting the exploration of 
+00075     move_init (move, __old_sol);        /* Restarting the exploration of 
 00076                                            of the neighborhood ! */
 00077 
-00078     move_select.init (__old_sol.fitness ());
+00078     move_select.init (__old_sol.fitness ());
 00079 
 00080     do
 00081       {
 00082 
-00083         Fitness fit = incr_eval (move, __old_sol);
+00083         Fitness fit = incr_eval (move, __old_sol);
 00084 
-00085         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
+00085         if (!tabu_list (move, __old_sol) || aspir_crit (move, fit))
 00086           {
-00087             if (!move_select.update (move, fit))
+00087             if (!move_select.update (move, fit))
 00088               break;
 00089           }
 00090 
 00091       }
-00092     while (next_move (move, __old_sol));
+00092     while (next_move (move, __old_sol));
 00093 
 00094     M best_move;
 00095 
-00096     Fitness best_move_fit;
+00096     Fitness best_move_fit;
 00097 
-00098     move_select (best_move, best_move_fit);
+00098     move_select (best_move, best_move_fit);
 00099 
 00100     __new_sol.fitness (best_move_fit);
 00101     best_move (__new_sol);
 00102 
 00103     /* Removing moves that are
 00104        no more tabu */
-00105     tabu_list.update ();
+00105     tabu_list.update ();
 00106 
 00107     // Updating the tabu list
-00108     tabu_list.add (best_move, __new_sol);
+00108     tabu_list.add (best_move, __new_sol);
 00109   }
 00110 
 00111 private:
 00112 
-00114   moMoveInit < M > &move_init;
+00114   moMoveInit < M > &move_init;
 00115 
-00117   moNextMove < M > &next_move;
+00117   moNextMove < M > &next_move;
 00118 
-00120   moMoveIncrEval < M > &incr_eval;
+00120   moMoveIncrEval < M > &incr_eval;
 00121 
-00123   moBestImprSelect < M > move_select;
+00123   moBestImprSelect < M > move_select;
 00124 
-00126   moTabuList < M > &tabu_list;
+00126   moTabuList < M > &tabu_list;
 00127 
-00129   moAspirCrit < M > &aspir_crit;
+00129   moAspirCrit < M > &aspir_crit;
 00130 };
 00131 
 00132 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html index 5db38ac7d..3aea24c1d 100644 --- a/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html +++ b/trunk/paradiseo-mo/docs/html/mo_tabu_list_8h-source.html @@ -1,15 +1,15 @@ - + PARADISEO-MO: moTabuList.h Source File - +
    + +

    moTabuList.h

    00001 // -*- mode: c++; c-indent-level: 4; c++-member-init-indent: 8; comment-column: 35; -*-
 00002 
 00003 // "moTabuList.h"
@@ -38,30 +39,30 @@
 00015 #include <eoFunctor.h>
 00016 
 00018 
-00022 template < class M > class moTabuList:public eoBF < const M &, const typename
+00022 template < class M > class moTabuList:public eoBF < const M &, const typename
 00023   M::EOType &,
 00024   bool >
 00025 {
 00026 
 00027 public:
-00029   typedef typename M::EOType EOT;
+00029   typedef typename M::EOType EOT;
 00030 
 00032 
 00038   virtual void
-00039   add (const M & __move, const EOT & __sol) = 0;
+00039   add (const M & __move, const EOT & __sol) = 0;
 00040 
 00042 
 00045   virtual void
-00046   update () = 0;
+00046   update () = 0;
 00047 
 00049 
 00052   virtual void
-00053   init () = 0;
+00053   init () = 0;
 00054 };
 00055 
 00056 #endif
-
    Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by  +
    Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
    +doxygen 1.5.2
    diff --git a/trunk/paradiseo-mo/docs/html/search.idx b/trunk/paradiseo-mo/docs/html/search.idx index b65f7a5f9..52b2853f3 100644 Binary files a/trunk/paradiseo-mo/docs/html/search.idx and b/trunk/paradiseo-mo/docs/html/search.idx differ diff --git a/trunk/paradiseo-mo/docs/html/search.php b/trunk/paradiseo-mo/docs/html/search.php index 8d0a23f22..859b38601 100644 --- a/trunk/paradiseo-mo/docs/html/search.php +++ b/trunk/paradiseo-mo/docs/html/search.php @@ -1,10 +1,10 @@ - + Search - +
    • Main Page
      • @@ -374,8 +374,8 @@ main(); ?> -
      Generated on Mon Apr 23 09:22:28 2007 for PARADISEO-MO by  +
      Generated on Mon Jun 25 17:41:42 2007 for PARADISEO-MO by  -doxygen 1.5.1
      +doxygen 1.5.2
      diff --git a/trunk/paradiseo-mo/docs/html/tabs.css b/trunk/paradiseo-mo/docs/html/tabs.css index a61552a67..c37faafe8 100644 --- a/trunk/paradiseo-mo/docs/html/tabs.css +++ b/trunk/paradiseo-mo/docs/html/tabs.css @@ -82,13 +82,13 @@ DIV.tabs A:hover SPAN background-position: 0% -150px; } -DIV.tabs LI#current A +DIV.tabs LI.current A { background-position: 100% -150px; border-width : 0px; } -DIV.tabs LI#current SPAN +DIV.tabs LI.current SPAN { background-position: 0% -150px; padding-bottom : 6px; diff --git a/trunk/paradiseo-mo/docs/html/tree.html b/trunk/paradiseo-mo/docs/html/tree.html index 8ff0fff2f..f7599816b 100644 --- a/trunk/paradiseo-mo/docs/html/tree.html +++ b/trunk/paradiseo-mo/docs/html/tree.html @@ -1,6 +1,6 @@ - + @@ -103,83 +103,98 @@

      |o*EmptySelection

      |o+eoFunctorBase [external]

      -

      ||o+eoBF< A1, A2, R > [external]

      +

      ||o+eoBF< const M &, const M::EOType &, bool > [external]

      -

      ||o+eoBF< const M::EOType &, M::EOType &, void > [external]

      +

      ||o+eoBF< const M &, const M::EOType &, M::EOType::Fitness > [external]

      + +

      ||o+eoBF< const M &, const M::EOType &, void > [external]

      + +

      ||o+eoBF< const M &, const M::EOType::Fitness &, bool > [external]

      -

      |||\+moMoveExpl< M >

      +

      |||\+moAspirCrit< M >

      +

      ||o+eoBF< const M::EOType &, M::EOType &, void > [external]

      + -

      ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

      -
      -

      |||\+moMoveSelect< M >

      -
      +

      ||o+eoBF< M &, const M::EOType &, bool > [external]

      + +

      ||o+eoBF< M &, const M::EOType &, void > [external]

      + +

      ||o+eoBF< M &, M::EOType::Fitness &, void > [external]

      + -

      ||o+eoUF< const EOT &, bool > [external]

      -
      -

      |||\+moSolContinue< EOT >

      -
      +

      ||o+eoUF< const EOT &, bool > [external]

      + -

      ||o+eoUF< double &, bool > [external]

      -
      -

      |||\+moCoolingSchedule

      -
      +

      ||o+eoUF< double &, bool > [external]

      + -

      ||o+eoUF< EOT &, bool > [external]

      -
      -

      |||\+eoMonOp< EOT > [external]

      -
      +

      ||o+eoUF< EOT &, bool > [external]

      +
      +

      |||\+eoMonOp< EOT > [external]

      +
      -

      ||o+eoUF< EOT &, void > [external]

      -
      +

      ||o+eoUF< EOT &, void > [external]

      +

      ||o*eoUF< EOType &, bool > [external]

      -

      ||o+eoUF< M &, void > [external]

      -
      +

      ||o+eoUF< M &, void > [external]

      + -

      ||\+eoUF< M::EOType &, bool > [external]

      -
      -

      || \+eoMonOp< M::EOType > [external]

      -
      -

      ||  \+moAlgo< M::EOType >

      -
      +

      ||\+eoUF< M::EOType &, bool > [external]

      +
      +

      || \+eoMonOp< M::EOType > [external]

      +
      +

      ||  \+moAlgo< M::EOType >

      +

      ||   o*moHC< M >

      ||   o*moSA< M >

      ||   \*moTS< M >

      @@ -187,15 +202,15 @@
      -

      |\+eoOp< EOType > [external]

      -
      +

      |\+eoOp< EOType > [external]

      +

      | o*eoMonOp< EOT > [external]

      | \*eoMonOp< M::EOType > [external]

      o*Class Members

      -

      \+File List

      -
      +

      \+File List

      +

       o*index.h

       o*mo.h

       o*moAlgo.h

      diff --git a/trunk/paradiseo-mo/docs/latex/annotated.tex b/trunk/paradiseo-mo/docs/latex/annotated.tex index e62c103d2..d9ae06077 100644 --- a/trunk/paradiseo-mo/docs/latex/annotated.tex +++ b/trunk/paradiseo-mo/docs/latex/annotated.tex @@ -1,34 +1,34 @@ \section{PARADISEO-MO Class List} Here are the classes, structs, unions and interfaces with brief descriptions:\begin{CompactList} -\item\contentsline{section}{{\bf Empty\-Selection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} -\item\contentsline{section}{{\bf mo\-Algo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} -\item\contentsline{section}{{\bf mo\-Aspir\-Crit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} -\item\contentsline{section}{{\bf mo\-Best\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} -\item\contentsline{section}{{\bf mo\-Cooling\-Schedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} -\item\contentsline{section}{{\bf mo\-Exponential\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} -\item\contentsline{section}{{\bf mo\-First\-Impr\-Select$<$ M $>$} (One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} -\item\contentsline{section}{{\bf mo\-Gen\-Sol\-Continue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} -\item\contentsline{section}{{\bf mo\-HC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} -\item\contentsline{section}{{\bf mo\-HCMove\-Loop\-Expl$<$ M $>$} (Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} -\item\contentsline{section}{{\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} (One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item\contentsline{section}{{\bf mo\-It\-Rand\-Next\-Move$<$ M $>$} (One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} -\item\contentsline{section}{{\bf mo\-Linear\-Cooling\-Schedule} (One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} -\item\contentsline{section}{{\bf mo\-LSCheck\-Point$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} -\item\contentsline{section}{{\bf mo\-Move$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} -\item\contentsline{section}{{\bf mo\-Move\-Expl$<$ M $>$} (Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} -\item\contentsline{section}{{\bf mo\-Move\-Incr\-Eval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} -\item\contentsline{section}{{\bf mo\-Move\-Init$<$ M $>$} (Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} -\item\contentsline{section}{{\bf mo\-Move\-Loop\-Expl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} -\item\contentsline{section}{{\bf mo\-Move\-Select$<$ M $>$} (Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} -\item\contentsline{section}{{\bf mo\-Next\-Move$<$ M $>$} (Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} -\item\contentsline{section}{{\bf mo\-No\-Aspir\-Crit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} -\item\contentsline{section}{{\bf mo\-Rand\-Impr\-Select$<$ M $>$} (One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} -\item\contentsline{section}{{\bf mo\-Rand\-Move$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} -\item\contentsline{section}{{\bf mo\-SA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} -\item\contentsline{section}{{\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} -\item\contentsline{section}{{\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} -\item\contentsline{section}{{\bf mo\-Sol\-Continue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} -\item\contentsline{section}{{\bf mo\-Tabu\-List$<$ M $>$} (Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} -\item\contentsline{section}{{\bf mo\-TS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} -\item\contentsline{section}{{\bf mo\-TSMove\-Loop\-Expl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} +\item\contentsline{section}{{\bf EmptySelection} (Special class that describes the case of no selection )}{\pageref{class_empty_selection}}{} +\item\contentsline{section}{{\bf moAlgo$<$ EOT $>$} (Description of an algorithm of the paradiseo-mo library )}{\pageref{classmo_algo}}{} +\item\contentsline{section}{{\bf moAspirCrit$<$ M $>$} (Description of the conditions in which a tabu move could be accepted )}{\pageref{classmo_aspir_crit}}{} +\item\contentsline{section}{{\bf moBestImprSelect$<$ M $>$} (One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_best_impr_select}}{} +\item\contentsline{section}{{\bf moCoolingSchedule} (This class gives the description of a cooling schedule )}{\pageref{classmo_cooling_schedule}}{} +\item\contentsline{section}{{\bf moExponentialCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_exponential_cooling_schedule}}{} +\item\contentsline{section}{{\bf moFirstImprSelect$<$ M $>$} (One possible \doxyref{moMoveSelect}{p.}{classmo_move_select} )}{\pageref{classmo_first_impr_select}}{} +\item\contentsline{section}{{\bf moGenSolContinue$<$ EOT $>$} (One possible stop criterion for a solution-based heuristic )}{\pageref{classmo_gen_sol_continue}}{} +\item\contentsline{section}{{\bf moHC$<$ M $>$} (Hill Climbing (HC) )}{\pageref{classmo_h_c}}{} +\item\contentsline{section}{{\bf moHCMoveLoopExpl$<$ M $>$} (Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c} )}{\pageref{classmo_h_c_move_loop_expl}}{} +\item\contentsline{section}{{\bf moImprBestFitAspirCrit$<$ M $>$} (One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit} )}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item\contentsline{section}{{\bf moItRandNextMove$<$ M $>$} (One of the possible \doxyref{moNextMove}{p.}{classmo_next_move} )}{\pageref{classmo_it_rand_next_move}}{} +\item\contentsline{section}{{\bf moLinearCoolingSchedule} (One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule} )}{\pageref{classmo_linear_cooling_schedule}}{} +\item\contentsline{section}{{\bf moLSCheckPoint$<$ M $>$} (Class which allows a checkpointing system )}{\pageref{classmo_l_s_check_point}}{} +\item\contentsline{section}{{\bf moMove$<$ EOT $>$} (Definition of a move )}{\pageref{classmo_move}}{} +\item\contentsline{section}{{\bf moMoveExpl$<$ M $>$} (Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer )}{\pageref{classmo_move_expl}}{} +\item\contentsline{section}{{\bf moMoveIncrEval$<$ M $>$} ((generally) Efficient evaluation function based a move and a solution )}{\pageref{classmo_move_incr_eval}}{} +\item\contentsline{section}{{\bf moMoveInit$<$ M $>$} (Move (\doxyref{moMove}{p.}{classmo_move}) initializer )}{\pageref{classmo_move_init}}{} +\item\contentsline{section}{{\bf moMoveLoopExpl$<$ M $>$} (Class which describes an iterative explorer )}{\pageref{classmo_move_loop_expl}}{} +\item\contentsline{section}{{\bf moMoveSelect$<$ M $>$} (Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_move_select}}{} +\item\contentsline{section}{{\bf moNextMove$<$ M $>$} (Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}) )}{\pageref{classmo_next_move}}{} +\item\contentsline{section}{{\bf moNoAspirCrit$<$ M $>$} (One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}) )}{\pageref{classmo_no_aspir_crit}}{} +\item\contentsline{section}{{\bf moRandImprSelect$<$ M $>$} (One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}) )}{\pageref{classmo_rand_impr_select}}{} +\item\contentsline{section}{{\bf moRandMove$<$ M $>$} (Random move generator )}{\pageref{classmo_rand_move}}{} +\item\contentsline{section}{{\bf moSA$<$ M $>$} (Simulated Annealing (SA) )}{\pageref{classmo_s_a}}{} +\item\contentsline{section}{{\bf moSimpleMoveTabuList$<$ M $>$} (Class describing a move tabu list with a limited memory )}{\pageref{classmo_simple_move_tabu_list}}{} +\item\contentsline{section}{{\bf moSimpleSolutionTabuList$<$ M $>$} (Class describing a solution tabu list with limited length )}{\pageref{classmo_simple_solution_tabu_list}}{} +\item\contentsline{section}{{\bf moSolContinue$<$ EOT $>$} (Class that describes a stop criterion for a solution-based heuristic )}{\pageref{classmo_sol_continue}}{} +\item\contentsline{section}{{\bf moTabuList$<$ M $>$} (Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses )}{\pageref{classmo_tabu_list}}{} +\item\contentsline{section}{{\bf moTS$<$ M $>$} (Tabu Search (TS) )}{\pageref{classmo_t_s}}{} +\item\contentsline{section}{{\bf moTSMoveLoopExpl$<$ M $>$} (Explorer for a Tabu Search algorithm )}{\pageref{classmo_t_s_move_loop_expl}}{} \end{CompactList} diff --git a/trunk/paradiseo-mo/docs/latex/class_empty_selection.tex b/trunk/paradiseo-mo/docs/latex/class_empty_selection.tex index 4b44303b4..942fea7fc 100644 --- a/trunk/paradiseo-mo/docs/latex/class_empty_selection.tex +++ b/trunk/paradiseo-mo/docs/latex/class_empty_selection.tex @@ -1,9 +1,9 @@ -\section{Empty\-Selection Class Reference} +\section{EmptySelection Class Reference} \label{class_empty_selection}\index{EmptySelection@{EmptySelection}} Special class that describes the case of no selection. -{\tt \#include $<$mo\-Move\-Select.h$>$} +{\tt \#include $<$moMoveSelect.h$>$} @@ -14,8 +14,8 @@ This class is used as an exception that can be thrown if a solution selector has -Definition at line 21 of file mo\-Move\-Select.h. +Definition at line 21 of file moMoveSelect.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Select.h\end{CompactItemize} +moMoveSelect.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex index bfd2994a6..6564c8f7a 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_algo.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_algo.tex @@ -1,11 +1,11 @@ -\section{mo\-Algo$<$ EOT $>$ Class Template Reference} +\section{moAlgo$<$ EOT $>$ Class Template Reference} \label{classmo_algo}\index{moAlgo@{moAlgo}} Description of an algorithm of the paradiseo-mo library. -{\tt \#include $<$mo\-Algo.h$>$} +{\tt \#include $<$moAlgo.h$>$} -Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moAlgo$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_algo} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Algo$<$ EOT $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Algo$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moAlgo$<$ EOT $>$} Description of an algorithm of the paradiseo-mo library. -\doxyref{mo\-HC}{p.}{classmo_h_c}, \doxyref{mo\-TS}{p.}{classmo_t_s} and \doxyref{mo\-SA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. +\doxyref{moHC}{p.}{classmo_h_c}, \doxyref{moTS}{p.}{classmo_t_s} and \doxyref{moSA}{p.}{classmo_s_a} are 3 examples of algorithm of the paradiseo-mo library. -Definition at line 21 of file mo\-Algo.h. +Definition at line 21 of file moAlgo.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Algo.h\end{CompactItemize} +moAlgo.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps index 7a0252d70..da056c4c6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 218.579 +%%BoundingBox: 0 0 500 119.76 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.2875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 4.175 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType::Fitness &, bool >) cw (eoFunctorBase) cw (moImprBestFitAspirCrit< M >) cw (moNoAspirCrit< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moAspirCrit< M >) 0.5 1 box - (eoBF< A1, A2, R >) 0.5 2 box + (eoBF< const M &, const M::EOType::Fitness &, bool >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moImprBestFitAspirCrit< M >) 0 0 box (moNoAspirCrit< M >) 1 0 box diff --git a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex index 646d32397..78dea621f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_aspir_crit.tex @@ -1,14 +1,14 @@ -\section{mo\-Aspir\-Crit$<$ M $>$ Class Template Reference} +\section{moAspirCrit$<$ M $>$ Class Template Reference} \label{classmo_aspir_crit}\index{moAspirCrit@{moAspirCrit}} Description of the conditions in which a tabu move could be accepted. -{\tt \#include $<$mo\-Aspir\-Crit.h$>$} +{\tt \#include $<$moAspirCrit.h$>$} -Inheritance diagram for mo\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_aspir_crit} +\includegraphics[height=3.35329cm]{classmo_aspir_crit} \end{center} \end{figure} \subsection*{Public Member Functions} @@ -19,28 +19,28 @@ virtual void {\bf init} ()=0 \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Aspir\-Crit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moAspirCrit$<$ M $>$} Description of the conditions in which a tabu move could be accepted. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. See mo\-No\-Aspri\-Crit for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{moTS}{p.}{classmo_t_s}. See moNoAspriCrit for example. -Definition at line 22 of file mo\-Aspir\-Crit.h. +Definition at line 22 of file moAspirCrit.h. \subsection{Member Function Documentation} -\index{moAspirCrit@{mo\-Aspir\-Crit}!init@{init}} -\index{init@{init}!moAspirCrit@{mo\-Aspir\-Crit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} +\index{moAspirCrit@{moAspirCrit}!init@{init}} +\index{init@{init}!moAspirCrit@{moAspirCrit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140} Procedure which initialises all that needs a aspiration criterion. It can be possible that this procedure do nothing... -Implemented in {\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf mo\-No\-Aspir\-Crit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. +Implemented in {\bf moImprBestFitAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630}, and {\bf moNoAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Aspir\-Crit.h\end{CompactItemize} +moAspirCrit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex index baf716c2f..1cb7a44d5 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_best_impr_select.tex @@ -1,11 +1,11 @@ -\section{mo\-Best\-Impr\-Select$<$ M $>$ Class Template Reference} +\section{moBestImprSelect$<$ M $>$ Class Template Reference} \label{classmo_best_impr_select}\index{moBestImprSelect@{moBestImprSelect}} -One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. +One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. -{\tt \#include $<$mo\-Best\-Impr\-Select.h$>$} +{\tt \#include $<$moBestImprSelect.h$>$} -Inheritance diagram for mo\-Best\-Impr\-Select$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moBestImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_best_impr_select} @@ -25,7 +25,7 @@ void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit)\label{classmo_best_impr_sele \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) +void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} @@ -42,25 +42,25 @@ M {\bf best\_\-move}\label{classmo_best_impr_select_bd86f70519f954c07ff0d8a2a3a8 \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Best\-Impr\-Select$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moBestImprSelect$<$ M $>$} -One of the possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. +One of the possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. All neighbors are considered, and the movement which enables the best improvement is selected. -Definition at line 22 of file mo\-Best\-Impr\-Select.h. +Definition at line 22 of file moBestImprSelect.h. \subsection{Member Function Documentation} -\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!update@{update}} -\index{update@{update}!moBestImprSelect@{mo\-Best\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Best\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} +\index{moBestImprSelect@{moBestImprSelect}!update@{update}} +\index{update@{update}!moBestImprSelect@{moBestImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moBestImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d} Function that indicates if the current move has not improved the fitness. -If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) and the fitness linked to this move are saved. +If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) and the fitness linked to this move are saved. \begin{Desc} \item[Parameters:] @@ -71,13 +71,13 @@ If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{cla \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Implements {\bf mo\-Move\-Select$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 47 of file mo\-Best\-Impr\-Select.h. +Definition at line 47 of file moBestImprSelect.h. -References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time.\index{moBestImprSelect@{mo\-Best\-Impr\-Select}!operator()@{operator()}} -\index{operator()@{operator()}!moBestImprSelect@{mo\-Best\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Best\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} +References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time.\index{moBestImprSelect@{moBestImprSelect}!operator()@{operator()}} +\index{operator()@{operator()}!moBestImprSelect@{moBestImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moBestImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_best_impr_select_169773d4d127acd782cf379f758222da} Procedure which saved the best move and fitness. @@ -90,16 +90,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 68 of file mo\-Best\-Impr\-Select.h. +Definition at line 68 of file moBestImprSelect.h. -References mo\-Best\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-Best\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-Best\-Impr\-Select$<$ M $>$::first\_\-time. +References moBestImprSelect$<$ M $>$::best\_\-fit, moBestImprSelect$<$ M $>$::best\_\-move, and moBestImprSelect$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Best\-Impr\-Select.h\end{CompactItemize} +moBestImprSelect.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex index 65e4977be..47648d9d0 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{mo\-Cooling\-Schedule Class Reference} +\section{moCoolingSchedule Class Reference} \label{classmo_cooling_schedule}\index{moCoolingSchedule@{moCoolingSchedule}} This class gives the description of a cooling schedule. -{\tt \#include $<$mo\-Cooling\-Schedule.h$>$} +{\tt \#include $<$moCoolingSchedule.h$>$} -Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H] +Inheritance diagram for moCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_cooling_schedule} @@ -16,12 +16,12 @@ Inheritance diagram for mo\-Cooling\-Schedule::\begin{figure}[H] \subsection{Detailed Description} This class gives the description of a cooling schedule. -It is only a description... An object that herits from this class is needed to be used in a \doxyref{mo\-SA}{p.}{classmo_s_a}. See \doxyref{mo\-Exponential\-Cooling\-Schedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{mo\-Linear\-Cooling\-Schedule}{p.}{classmo_linear_cooling_schedule} for example. +It is only a description... An object that herits from this class is needed to be used in a \doxyref{moSA}{p.}{classmo_s_a}. See \doxyref{moExponentialCoolingSchedule}{p.}{classmo_exponential_cooling_schedule} or \doxyref{moLinearCoolingSchedule}{p.}{classmo_linear_cooling_schedule} for example. -Definition at line 22 of file mo\-Cooling\-Schedule.h. +Definition at line 22 of file moCoolingSchedule.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Cooling\-Schedule.h\end{CompactItemize} +moCoolingSchedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex index 4848b8570..b572655f6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_exponential_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{mo\-Exponential\-Cooling\-Schedule Class Reference} +\section{moExponentialCoolingSchedule Class Reference} \label{classmo_exponential_cooling_schedule}\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$mo\-Exponential\-Cooling\-Schedule.h$>$} +{\tt \#include $<$moExponentialCoolingSchedule.h$>$} -Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] +Inheritance diagram for moExponentialCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_exponential_cooling_schedule} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-Exponential\-Cooling\-Schedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Exponential\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) +{\bf moExponentialCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-ratio) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (double \&\_\-\_\-temp) \begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} @@ -30,18 +30,18 @@ double {\bf ratio}\label{classmo_exponential_cooling_schedule_e8f3f87417c1c7253e \subsection{Detailed Description} -One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. An other very simple cooling schedule, the temperature decrease according to a ratio while the temperature is greater than a given threshold. -Definition at line 22 of file mo\-Exponential\-Cooling\-Schedule.h. +Definition at line 22 of file moExponentialCoolingSchedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} -\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Exponential\-Cooling\-Schedule::mo\-Exponential\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moExponentialCoolingSchedule::moExponentialCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-ratio})\hspace{0.3cm}{\tt [inline]}}\label{classmo_exponential_cooling_schedule_b01930c1051c0940666c6325bfd036bc} Simple constructor. @@ -53,12 +53,12 @@ Simple constructor. \end{Desc} -Definition at line 31 of file mo\-Exponential\-Cooling\-Schedule.h. +Definition at line 31 of file moExponentialCoolingSchedule.h. \subsection{Member Function Documentation} -\index{moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}!operator()@{operator()}} -\index{operator()@{operator()}!moExponentialCoolingSchedule@{mo\-Exponential\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Exponential\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} +\index{moExponentialCoolingSchedule@{moExponentialCoolingSchedule}!operator()@{operator()}} +\index{operator()@{operator()}!moExponentialCoolingSchedule@{moExponentialCoolingSchedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moExponentialCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_exponential_cooling_schedule_00642b03453b51612a10fcf2280543db} Function which proceeds to the cooling. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature $\ast$ ratio) is greater than the threshold. \end{Desc} -Implements {\bf eo\-UF$<$ double \&, bool $>$}. +Implements {\bf eoUF$<$ double \&, bool $>$}. -Definition at line 41 of file mo\-Exponential\-Cooling\-Schedule.h. +Definition at line 41 of file moExponentialCoolingSchedule.h. References ratio, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Exponential\-Cooling\-Schedule.h\end{CompactItemize} +moExponentialCoolingSchedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex index e28acfa68..412bfec33 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_first_impr_select.tex @@ -1,11 +1,11 @@ -\section{mo\-First\-Impr\-Select$<$ M $>$ Class Template Reference} +\section{moFirstImprSelect$<$ M $>$ Class Template Reference} \label{classmo_first_impr_select}\index{moFirstImprSelect@{moFirstImprSelect}} -One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. +One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. -{\tt \#include $<$mo\-First\-Impr\-Select.h$>$} +{\tt \#include $<$moFirstImprSelect.h$>$} -Inheritance diagram for mo\-First\-Impr\-Select$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moFirstImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_first_impr_select} @@ -24,7 +24,7 @@ virtual void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Procedure which initialise the exploration. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-fit) \begin{CompactList}\small\item\em Function that indicates if the current move has not improved the fitness. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) +void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) \begin{CompactList}\small\item\em Procedure which saved the best move and fitness. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} @@ -44,38 +44,38 @@ M {\bf best\_\-move}\label{classmo_first_impr_select_dfed419a608dd7c41f07fa1f127 \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-First\-Impr\-Select$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moFirstImprSelect$<$ M $>$} -One possible \doxyref{mo\-Move\-Select}{p.}{classmo_move_select}. +One possible \doxyref{moMoveSelect}{p.}{classmo_move_select}. The neighborhood is explored until a move enables an improvment of the current solution. -Definition at line 23 of file mo\-First\-Impr\-Select.h. +Definition at line 23 of file moFirstImprSelect.h. \subsection{Member Function Documentation} -\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!init@{init}} -\index{init@{init}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-First\-Impr\-Select}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} +\index{moFirstImprSelect@{moFirstImprSelect}!init@{init}} +\index{init@{init}!moFirstImprSelect@{moFirstImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moFirstImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055} Procedure which initialise the exploration. It save the current fitness as the initial value for the fitness. -Implements {\bf mo\-Move\-Select$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 35 of file mo\-First\-Impr\-Select.h. +Definition at line 35 of file moFirstImprSelect.h. -References mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!update@{update}} -\index{update@{update}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-First\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} +References moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!update@{update}} +\index{update@{update}!moFirstImprSelect@{moFirstImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moFirstImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_first_impr_select_7ba0882728daedc75c249647c070ccf0} Function that indicates if the current move has not improved the fitness. -If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{classmo_move}) should be applied to the current solution. +If the given fitness enables an improvment, the move (\doxyref{moMove}{p.}{classmo_move}) should be applied to the current solution. \begin{Desc} \item[Parameters:] @@ -86,11 +86,11 @@ If the given fitness enables an improvment, the move (\doxyref{mo\-Move}{p.}{cla \item[Returns:]TRUE if the move does not improve the fitness. \end{Desc} -Definition at line 52 of file mo\-First\-Impr\-Select.h. +Definition at line 52 of file moFirstImprSelect.h. -References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, mo\-First\-Impr\-Select$<$ M $>$::init\_\-fit, and mo\-First\-Impr\-Select$<$ M $>$::valid.\index{moFirstImprSelect@{mo\-First\-Impr\-Select}!operator()@{operator()}} -\index{operator()@{operator()}!moFirstImprSelect@{mo\-First\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-First\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} +References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, moFirstImprSelect$<$ M $>$::init\_\-fit, and moFirstImprSelect$<$ M $>$::valid.\index{moFirstImprSelect@{moFirstImprSelect}!operator()@{operator()}} +\index{operator()@{operator()}!moFirstImprSelect@{moFirstImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moFirstImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_first_impr_select_3be12cf4cbaed00df7c4fa735b2c0a95} Procedure which saved the best move and fitness. @@ -103,16 +103,16 @@ Procedure which saved the best move and fitness. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} +\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]if no move has improved the fitness. \end{description} \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 76 of file mo\-First\-Impr\-Select.h. +Definition at line 76 of file moFirstImprSelect.h. -References mo\-First\-Impr\-Select$<$ M $>$::best\_\-fit, mo\-First\-Impr\-Select$<$ M $>$::best\_\-move, and mo\-First\-Impr\-Select$<$ M $>$::valid. +References moFirstImprSelect$<$ M $>$::best\_\-fit, moFirstImprSelect$<$ M $>$::best\_\-move, and moFirstImprSelect$<$ M $>$::valid. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-First\-Impr\-Select.h\end{CompactItemize} +moFirstImprSelect.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex index 4b0194020..19c044b84 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_gen_sol_continue.tex @@ -1,11 +1,11 @@ -\section{mo\-Gen\-Sol\-Continue$<$ EOT $>$ Class Template Reference} +\section{moGenSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_gen_sol_continue}\index{moGenSolContinue@{moGenSolContinue}} One possible stop criterion for a solution-based heuristic. -{\tt \#include $<$mo\-Gen\-Sol\-Continue.h$>$} +{\tt \#include $<$moGenSolContinue.h$>$} -Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moGenSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_gen_sol_continue} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-Gen\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Gen\-Sol\-Continue} (unsigned \_\-\_\-max\-Num\-Gen) +{\bf moGenSolContinue} (unsigned int \_\-\_\-maxNumGen) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (const EOT \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that activates the stop criterion. \item\end{CompactList}\item @@ -23,16 +23,16 @@ void {\bf init} () \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned {\bf max\-Num\-Gen}\label{classmo_gen_sol_continue_6d7674fc51d17423e8ee28693a08b5af} +unsigned int {\bf maxNumGen}\label{classmo_gen_sol_continue_30b9861e090578bdfa2374806600987a} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned {\bf num\-Gen}\label{classmo_gen_sol_continue_a18ebfd270f96517b4edaa2cad3eb9e0} +unsigned int {\bf numGen}\label{classmo_gen_sol_continue_630d9736a3a2c952540cdc211764258c} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Gen\-Sol\-Continue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moGenSolContinue$<$ EOT $>$} One possible stop criterion for a solution-based heuristic. @@ -40,12 +40,12 @@ The stop criterion corresponds to a maximum number of iteration. -Definition at line 21 of file mo\-Gen\-Sol\-Continue.h. +Definition at line 21 of file moGenSolContinue.h. \subsection{Constructor \& Destructor Documentation} -\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!moGenSolContinue@{moGenSolContinue}} -\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::{\bf mo\-Gen\-Sol\-Continue} (unsigned {\em \_\-\_\-max\-Num\-Gen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_6b6cab23a23bd8904ea52ef5141d8d0a} +\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} +\index{moGenSolContinue@{moGenSolContinue}!moGenSolContinue@{moGenSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ {\bf moGenSolContinue}$<$ EOT $>$::{\bf moGenSolContinue} (unsigned int {\em \_\-\_\-maxNumGen})\hspace{0.3cm}{\tt [inline]}}\label{classmo_gen_sol_continue_b56e890f1caa3f98e161c6512b59c95b} Simple constructor. @@ -53,16 +53,16 @@ Simple constructor. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-max\-Num\-Gen}]the maximum number of generation. \end{description} +\item[{\em \_\-\_\-maxNumGen}]the maximum number of generation. \end{description} \end{Desc} -Definition at line 30 of file mo\-Gen\-Sol\-Continue.h. +Definition at line 30 of file moGenSolContinue.h. \subsection{Member Function Documentation} -\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!operator()@{operator()}} -\index{operator()@{operator()}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} +\index{moGenSolContinue@{moGenSolContinue}!operator()@{operator()}} +\index{operator()@{operator()}!moGenSolContinue@{moGenSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ bool {\bf moGenSolContinue}$<$ EOT $>$::operator() (const EOT \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_457257cd73b474d6f7783d84d02c2e61} Function that activates the stop criterion. @@ -78,25 +78,25 @@ Increments the counter and returns TRUE if the current number of iteration is lo \item[Returns:]TRUE or FALSE according to the current generation number. \end{Desc} -Implements {\bf eo\-UF$<$ const EOT \&, bool $>$}. +Implements {\bf eoUF$<$ const EOT \&, bool $>$}. -Definition at line 44 of file mo\-Gen\-Sol\-Continue.h. +Definition at line 44 of file moGenSolContinue.h. -References mo\-Gen\-Sol\-Continue$<$ EOT $>$::max\-Num\-Gen, and mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen.\index{moGenSolContinue@{mo\-Gen\-Sol\-Continue}!init@{init}} -\index{init@{init}!moGenSolContinue@{mo\-Gen\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf mo\-Gen\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} +References moGenSolContinue$<$ EOT $>$::maxNumGen, and moGenSolContinue$<$ EOT $>$::numGen.\index{moGenSolContinue@{moGenSolContinue}!init@{init}} +\index{init@{init}!moGenSolContinue@{moGenSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ void {\bf moGenSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4} Procedure which allows to initialise the generation counter. It can also be used to reset the iteration counter. -Implements {\bf mo\-Sol\-Continue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. +Implements {\bf moSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7}. -Definition at line 54 of file mo\-Gen\-Sol\-Continue.h. +Definition at line 54 of file moGenSolContinue.h. -References mo\-Gen\-Sol\-Continue$<$ EOT $>$::num\-Gen. +References moGenSolContinue$<$ EOT $>$::numGen. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Gen\-Sol\-Continue.h\end{CompactItemize} +moGenSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex index dc5b26818..b402914eb 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c.tex @@ -1,11 +1,11 @@ -\section{mo\-HC$<$ M $>$ Class Template Reference} +\section{moHC$<$ M $>$ Class Template Reference} \label{classmo_h_c}\index{moHC@{moHC}} Hill Climbing (HC). -{\tt \#include $<$mo\-HC.h$>$} +{\tt \#include $<$moHC.h$>$} -Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moHC$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c} @@ -14,9 +14,9 @@ Inheritance diagram for mo\-HC$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Full constructor. \item\end{CompactList}\item -{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Light constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the HC. \item\end{CompactList}\end{CompactItemize} @@ -32,16 +32,16 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_h_c_56487c97a7cf0c423cc879d1bbd \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Move\-Expl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} +{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_h_c_f6bfb4553fb699f1e08f7d9c37d06103} \begin{CompactList}\small\item\em Complete exploration of the neighborhood. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} +{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_h_c_4b0d5cc70fc3d83f59a48b2bdea65736} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-HC$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moHC$<$ M $>$} Hill Climbing (HC). @@ -49,17 +49,17 @@ Class which describes the algorithm for a hill climbing. -Definition at line 26 of file mo\-HC.h. +Definition at line 26 of file moHC.h. \subsection{Constructor \& Destructor Documentation} -\index{moHC@{mo\-HC}!moHC@{moHC}} -\index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} +\index{moHC@{moHC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{moHC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_6cafe093f86a80c225827884cb9dc5b7} Full constructor. -All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}. +All the boxes are given in order the HC to use a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}. \begin{Desc} \item[Parameters:] @@ -68,14 +68,14 @@ All the boxes are given in order the HC to use a \doxyref{mo\-HCMove\-Loop\-Expl \end{Desc} -Definition at line 53 of file mo\-HC.h.\index{moHC@{mo\-HC}!moHC@{moHC}} -\index{moHC@{moHC}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HC}$<$ M $>$::{\bf mo\-HC} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} +Definition at line 53 of file moHC.h.\index{moHC@{moHC}!moHC@{moHC}} +\index{moHC@{moHC}!moHC@{moHC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHC}$<$ M $>$::{\bf moHC} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_45f27309792e584a27fa6dcb86ccda65} Light constructor. -This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_expl} (generally not a \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl}). +This constructor allow to use another \doxyref{moMoveExpl}{p.}{classmo_move_expl} (generally not a \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl}). \begin{Desc} \item[Parameters:] @@ -84,17 +84,17 @@ This constructor allow to use another \doxyref{mo\-Move\-Expl}{p.}{classmo_move_ \end{Desc} -Definition at line 67 of file mo\-HC.h. +Definition at line 67 of file moHC.h. \subsection{Member Function Documentation} -\index{moHC@{mo\-HC}!operator()@{operator()}} -\index{operator()@{operator()}!moHC@{mo\-HC}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-HC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} +\index{moHC@{moHC}!operator()@{operator()}} +\index{operator()@{operator()}!moHC@{moHC}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moHC}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_ed4e273c420efa6386c5975a696a5010} Function which launches the HC. -The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. +The HC has to improve a current solution. As the \doxyref{moSA}{p.}{classmo_s_a} and the mo TS, it can be used for HYBRIDATION in an evolutionnary algorithm. \begin{Desc} \item[Parameters:] @@ -105,12 +105,12 @@ The HC has to improve a current solution. As the \doxyref{mo\-SA}{p.}{classmo_s_ \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. +Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. -Definition at line 82 of file mo\-HC.h. +Definition at line 82 of file moHC.h. -References mo\-HC$<$ M $>$::full\_\-eval, and mo\-HC$<$ M $>$::move\_\-expl. +References moHC$<$ M $>$::full\_\-eval, and moHC$<$ M $>$::move\_\-expl. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-HC.h\end{CompactItemize} +moHC.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex index e404ab915..776f8a638 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_h_c_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{mo\-HCMove\-Loop\-Expl$<$ M $>$ Class Template Reference} +\section{moHCMoveLoopExpl$<$ M $>$ Class Template Reference} \label{classmo_h_c_move_loop_expl}\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}} -Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. -{\tt \#include $<$mo\-HCMove\-Loop\-Expl.h$>$} +{\tt \#include $<$moHCMoveLoopExpl.h$>$} -Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moHCMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_h_c_move_loop_expl} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-HCMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-HCMove\-Loop\-Expl} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Move\-Select}$<$ M $>$ \&\_\-\_\-move\_\-select) +{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moMoveSelect}$<$ M $>$ \&\_\-\_\-move\_\-select) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which launches the explorer. \item\end{CompactList}\end{CompactItemize} @@ -30,33 +30,33 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_h_c_move_loop_expl_f24871 \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Move\-Init}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} +{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_h_c_move_loop_expl_6776fc51331c1b452d026b92448b4ffc} \begin{CompactList}\small\item\em Move initialiser. \item\end{CompactList}\item -{\bf mo\-Next\-Move}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} +{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_h_c_move_loop_expl_f716c5271e0eba9275c585dc52768443} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} +{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_h_c_move_loop_expl_84a8fccba05ab30414281469bc8ee779} \begin{CompactList}\small\item\em (generally) Efficient evaluation. \item\end{CompactList}\item -{\bf mo\-Move\-Select}$<$ M $>$ \& {\bf move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} +{\bf moMoveSelect}$<$ M $>$ \& {\bf move\_\-select}\label{classmo_h_c_move_loop_expl_13bcd1322b2b97fd665be2f60c532fbb} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-HCMove\-Loop\-Expl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moHCMoveLoopExpl$<$ M $>$} -Iterative explorer used by a \doxyref{mo\-HC}{p.}{classmo_h_c}. +Iterative explorer used by a \doxyref{moHC}{p.}{classmo_h_c}. -Definition at line 23 of file mo\-HCMove\-Loop\-Expl.h. +Definition at line 23 of file moHCMoveLoopExpl.h. \subsection{Constructor \& Destructor Documentation} -\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} -\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::{\bf mo\-HCMove\-Loop\-Expl} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Move\-Select}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} +\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} +\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moHCMoveLoopExpl}$<$ M $>$::{\bf moHCMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moMoveSelect}$<$ M $>$ \& {\em \_\-\_\-move\_\-select})\hspace{0.3cm}{\tt [inline]}}\label{classmo_h_c_move_loop_expl_11410d648d79746253e9dc249c4ec7b5} Constructor. @@ -70,12 +70,12 @@ All the boxes have to be specified. \end{Desc} -Definition at line 43 of file mo\-HCMove\-Loop\-Expl.h. +Definition at line 43 of file moHCMoveLoopExpl.h. \subsection{Member Function Documentation} -\index{moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}!operator()@{operator()}} -\index{operator()@{operator()}!moHCMoveLoopExpl@{mo\-HCMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-HCMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} +\index{moHCMoveLoopExpl@{moHCMoveLoopExpl}!operator()@{operator()}} +\index{operator()@{operator()}!moHCMoveLoopExpl@{moHCMoveLoopExpl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moHCMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_h_c_move_loop_expl_f48d5379caac7f6a165e9fe8840e6ccb} Procedure which launches the explorer. @@ -89,12 +89,12 @@ The exploration starts from an old solution and provides a new solution. \end{Desc} -Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 59 of file mo\-HCMove\-Loop\-Expl.h. +Definition at line 59 of file moHCMoveLoopExpl.h. -References mo\-HCMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-HCMove\-Loop\-Expl$<$ M $>$::move\_\-select, and mo\-HCMove\-Loop\-Expl$<$ M $>$::next\_\-move. +References moHCMoveLoopExpl$<$ M $>$::incr\_\-eval, moHCMoveLoopExpl$<$ M $>$::move\_\-init, moHCMoveLoopExpl$<$ M $>$::move\_\-select, and moHCMoveLoopExpl$<$ M $>$::next\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-HCMove\-Loop\-Expl.h\end{CompactItemize} +moHCMoveLoopExpl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps index a00a3c3cb..b569936e2 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 437.158 +%%BoundingBox: 0 0 500 239.521 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.14375 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moImprBestFitAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType::Fitness &, bool >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moImprBestFitAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex index 33da06ec9..6647d77fa 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_impr_best_fit_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$ Class Template Reference} +\section{moImprBestFitAspirCrit$<$ M $>$ Class Template Reference} \label{classmo_impr_best_fit_aspir_crit}\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} -One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. -{\tt \#include $<$mo\-Impr\-Best\-Fit\-Aspir\-Crit.h$>$} +{\tt \#include $<$moImprBestFitAspirCrit.h$>$} -Inheritance diagram for mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moImprBestFitAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_impr_best_fit_aspir_crit} @@ -20,7 +20,7 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_impr_best_fit_aspir_crit_ \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} +{\bf moImprBestFitAspirCrit} ()\label{classmo_impr_best_fit_aspir_crit_e2c697a5cf3a7696e38bb52b6694a340} \begin{CompactList}\small\item\em Contructor. \item\end{CompactList}\item void {\bf init} ()\label{classmo_impr_best_fit_aspir_crit_ffa451a14ff4ea86fb8bd9fdbc348630} @@ -40,20 +40,20 @@ bool {\bf first\_\-time}\label{classmo_impr_best_fit_aspir_crit_2d5226c7dd661b33 \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moImprBestFitAspirCrit$<$ M $>$} -One of the possible \doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}. +One of the possible \doxyref{moAspirCrit}{p.}{classmo_aspir_crit}. This criterion is satisfied when a given fitness is the best ever considered. -Definition at line 22 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. +Definition at line 22 of file moImprBestFitAspirCrit.h. \subsection{Member Function Documentation} -\index{moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}!operator()@{operator()}} -\index{operator()@{operator()}!moImprBestFitAspirCrit@{mo\-Impr\-Best\-Fit\-Aspir\-Crit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Impr\-Best\-Fit\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} +\index{moImprBestFitAspirCrit@{moImprBestFitAspirCrit}!operator()@{operator()}} +\index{operator()@{operator()}!moImprBestFitAspirCrit@{moImprBestFitAspirCrit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moImprBestFitAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_impr_best_fit_aspir_crit_53f62fb56dcae3051a741f1fddb0204b} Function that indicates if the fit is better that the already saved fit. @@ -69,10 +69,12 @@ The first time, the function only saved the current move and fitness. \item[Returns:]TRUE the first time and if \_\-\_\-fit $>$ best\_\-fit, else FALSE. \end{Desc} -Definition at line 52 of file mo\-Impr\-Best\-Fit\-Aspir\-Crit.h. +Implements {\bf eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>$}. -References mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::best\_\-fit, and mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$::first\_\-time. +Definition at line 52 of file moImprBestFitAspirCrit.h. + +References moImprBestFitAspirCrit$<$ M $>$::best\_\-fit, and moImprBestFitAspirCrit$<$ M $>$::first\_\-time. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Impr\-Best\-Fit\-Aspir\-Crit.h\end{CompactItemize} +moImprBestFitAspirCrit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps index 5f2df0014..3c5267824 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 490.798 +%%BoundingBox: 0 0 500 316.206 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moItRandNextMove< M >) cw (moNextMove< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< M &, const M::EOType &, bool >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moItRandNextMove< M >) 0 0 box (moNextMove< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< M &, const M::EOType &, bool >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex index b3346119d..e7abc9a90 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_it_rand_next_move.tex @@ -1,11 +1,11 @@ -\section{mo\-It\-Rand\-Next\-Move$<$ M $>$ Class Template Reference} +\section{moItRandNextMove$<$ M $>$ Class Template Reference} \label{classmo_it_rand_next_move}\index{moItRandNextMove@{moItRandNextMove}} -One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. +One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. -{\tt \#include $<$mo\-It\-Rand\-Next\-Move.h$>$} +{\tt \#include $<$moItRandNextMove.h$>$} -Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moItRandNextMove$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_it_rand_next_move} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-It\-Rand\-Next\-Move$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-It\-Rand\-Next\-Move} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned \_\-\_\-max\_\-iter) +{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-rand\_\-move, unsigned int \_\-\_\-max\_\-iter) \begin{CompactList}\small\item\em The constructor. \item\end{CompactList}\item bool {\bf operator()} (M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Generation of a new move. \item\end{CompactList}\end{CompactItemize} @@ -27,32 +27,32 @@ typedef M::EOType {\bf EOT}\label{classmo_it_rand_next_move_ee666007fc494bf4a5f0 \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Rand\-Move}$<$ M $>$ \& {\bf rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} +{\bf moRandMove}$<$ M $>$ \& {\bf rand\_\-move}\label{classmo_it_rand_next_move_ef9410ec5e7dfa7f002e05967931c459} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -unsigned {\bf max\_\-iter}\label{classmo_it_rand_next_move_3c476f7cc089b171493c52965f920542} +unsigned int {\bf max\_\-iter}\label{classmo_it_rand_next_move_dc67fa86677d7a4f982de8d8b1eba033} \begin{CompactList}\small\item\em Iteration maximum number. \item\end{CompactList}\item -unsigned {\bf num\_\-iter}\label{classmo_it_rand_next_move_c3551d7910cf351d63f0f3427fc18504} +unsigned int {\bf num\_\-iter}\label{classmo_it_rand_next_move_f43494b13931d8f76b5d9d5d6469e91b} \begin{CompactList}\small\item\em Iteration current number. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-It\-Rand\-Next\-Move$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moItRandNextMove$<$ M $>$} -One of the possible \doxyref{mo\-Next\-Move}{p.}{classmo_next_move}. +One of the possible \doxyref{moNextMove}{p.}{classmo_next_move}. -This class is a move (\doxyref{mo\-Move}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. +This class is a move (\doxyref{moMove}{p.}{classmo_move}) generator with a bound for the maximum number of iterations. -Definition at line 22 of file mo\-It\-Rand\-Next\-Move.h. +Definition at line 22 of file moItRandNextMove.h. \subsection{Constructor \& Destructor Documentation} -\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!moItRandNextMove@{moItRandNextMove}} -\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-It\-Rand\-Next\-Move}$<$ M $>$::{\bf mo\-It\-Rand\-Next\-Move} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_95ed13e1178f4e44cab7184b040b83d7} +\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} +\index{moItRandNextMove@{moItRandNextMove}!moItRandNextMove@{moItRandNextMove}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moItRandNextMove}$<$ M $>$::{\bf moItRandNextMove} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-rand\_\-move}, unsigned int {\em \_\-\_\-max\_\-iter})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_2b61b3713d482ecf71db8d941551ff7a} The constructor. @@ -66,12 +66,12 @@ The constructor. \end{Desc} -Definition at line 37 of file mo\-It\-Rand\-Next\-Move.h. +Definition at line 37 of file moItRandNextMove.h. \subsection{Member Function Documentation} -\index{moItRandNextMove@{mo\-It\-Rand\-Next\-Move}!operator()@{operator()}} -\index{operator()@{operator()}!moItRandNextMove@{mo\-It\-Rand\-Next\-Move}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-It\-Rand\-Next\-Move}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} +\index{moItRandNextMove@{moItRandNextMove}!operator()@{operator()}} +\index{operator()@{operator()}!moItRandNextMove@{moItRandNextMove}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moItRandNextMove}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_it_rand_next_move_92a2fbbc02a20853b9a309e99018a102} Generation of a new move. @@ -87,10 +87,12 @@ If the maximum number is not already reached, the current move is forgotten and \item[Returns:]FALSE if the maximum number of iteration is reached, else TRUE. \end{Desc} -Definition at line 52 of file mo\-It\-Rand\-Next\-Move.h. +Implements {\bf eoBF$<$ M \&, const M::EOType \&, bool $>$}. -References mo\-It\-Rand\-Next\-Move$<$ M $>$::max\_\-iter, mo\-It\-Rand\-Next\-Move$<$ M $>$::num\_\-iter, and mo\-It\-Rand\-Next\-Move$<$ M $>$::rand\_\-move. +Definition at line 52 of file moItRandNextMove.h. + +References moItRandNextMove$<$ M $>$::max\_\-iter, moItRandNextMove$<$ M $>$::num\_\-iter, and moItRandNextMove$<$ M $>$::rand\_\-move. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-It\-Rand\-Next\-Move.h\end{CompactItemize} +moItRandNextMove.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex index 968b56892..b9d378132 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_l_s_check_point.tex @@ -1,11 +1,11 @@ -\section{mo\-LSCheck\-Point$<$ M $>$ Class Template Reference} +\section{moLSCheckPoint$<$ M $>$ Class Template Reference} \label{classmo_l_s_check_point}\index{moLSCheckPoint@{moLSCheckPoint}} Class which allows a checkpointing system. -{\tt \#include $<$mo\-LSCheck\-Point.h$>$} +{\tt \#include $<$moLSCheckPoint.h$>$} -Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moLSCheckPoint$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_l_s_check_point} @@ -16,18 +16,18 @@ Inheritance diagram for mo\-LSCheck\-Point$<$ M $>$::\begin{figure}[H] \item void {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launches the checkpointing. \item\end{CompactList}\item -void {\bf add} ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) +void {\bf add} ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \&\_\-\_\-f) \begin{CompactList}\small\item\em Procedure which add a new function to the function vector. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -std::vector$<$ {\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} +std::vector$<$ {\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ $\ast$ $>$ {\bf func}\label{classmo_l_s_check_point_ff2a31ee5689a804bd9a572c51a36ca4} \begin{CompactList}\small\item\em vector of function \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-LSCheck\-Point$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moLSCheckPoint$<$ M $>$} Class which allows a checkpointing system. @@ -35,12 +35,12 @@ Thanks to this class, at each iteration, additionnal function can be used (and n -Definition at line 21 of file mo\-LSCheck\-Point.h. +Definition at line 21 of file moLSCheckPoint.h. \subsection{Member Function Documentation} -\index{moLSCheckPoint@{mo\-LSCheck\-Point}!operator()@{operator()}} -\index{operator()@{operator()}!moLSCheckPoint@{mo\-LSCheck\-Point}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} +\index{moLSCheckPoint@{moLSCheckPoint}!operator()@{operator()}} +\index{operator()@{operator()}!moLSCheckPoint@{moLSCheckPoint}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_2f9c1250279e3f49ec77a66c10029f1e} Function which launches the checkpointing. @@ -54,11 +54,11 @@ Each saved function is used on the current move and the current solution. \end{Desc} -Definition at line 34 of file mo\-LSCheck\-Point.h. +Definition at line 34 of file moLSCheckPoint.h. -References mo\-LSCheck\-Point$<$ M $>$::func.\index{moLSCheckPoint@{mo\-LSCheck\-Point}!add@{add}} -\index{add@{add}!moLSCheckPoint@{mo\-LSCheck\-Point}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-LSCheck\-Point}$<$ M $>$::add ({\bf eo\-BF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} +References moLSCheckPoint$<$ M $>$::func.\index{moLSCheckPoint@{moLSCheckPoint}!add@{add}} +\index{add@{add}!moLSCheckPoint@{moLSCheckPoint}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moLSCheckPoint}$<$ M $>$::add ({\bf eoBF}$<$ const M \&, const typename M::EOType \&, void $>$ \& {\em \_\-\_\-f})\hspace{0.3cm}{\tt [inline]}}\label{classmo_l_s_check_point_66be5fe2944bcdd752f1e58105e969a6} Procedure which add a new function to the function vector. @@ -70,10 +70,10 @@ The new function is added at the end of the vector. \begin{Desc} \end{Desc} -Definition at line 49 of file mo\-LSCheck\-Point.h. +Definition at line 49 of file moLSCheckPoint.h. -References mo\-LSCheck\-Point$<$ M $>$::func. +References moLSCheckPoint$<$ M $>$::func. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-LSCheck\-Point.h\end{CompactItemize} +moLSCheckPoint.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex index 37594c6db..59b77e02d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_linear_cooling_schedule.tex @@ -1,11 +1,11 @@ -\section{mo\-Linear\-Cooling\-Schedule Class Reference} +\section{moLinearCoolingSchedule Class Reference} \label{classmo_linear_cooling_schedule}\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}} -One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. -{\tt \#include $<$mo\-Linear\-Cooling\-Schedule.h$>$} +{\tt \#include $<$moLinearCoolingSchedule.h$>$} -Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] +Inheritance diagram for moLinearCoolingSchedule::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_linear_cooling_schedule} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-Linear\-Cooling\-Schedule::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Linear\-Cooling\-Schedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) +{\bf moLinearCoolingSchedule} (double \_\-\_\-threshold, double \_\-\_\-quantity) \begin{CompactList}\small\item\em Simple constructor. \item\end{CompactList}\item bool {\bf operator()} (double \&\_\-\_\-temp) \begin{CompactList}\small\item\em Function which proceeds to the cooling. \item\end{CompactList}\end{CompactItemize} @@ -30,18 +30,18 @@ double {\bf quantity}\label{classmo_linear_cooling_schedule_6159dc39ceda89b23ffd \subsection{Detailed Description} -One of the possible \doxyref{mo\-Cooling\-Schedule}{p.}{classmo_cooling_schedule}. +One of the possible \doxyref{moCoolingSchedule}{p.}{classmo_cooling_schedule}. An another very simple cooling schedule, the temperature decrease according to a quantity while the temperature is greater than a threshold. -Definition at line 22 of file mo\-Linear\-Cooling\-Schedule.h. +Definition at line 22 of file moLinearCoolingSchedule.h. \subsection{Constructor \& Destructor Documentation} -\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} -\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}mo\-Linear\-Cooling\-Schedule::mo\-Linear\-Cooling\-Schedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}moLinearCoolingSchedule::moLinearCoolingSchedule (double {\em \_\-\_\-threshold}, double {\em \_\-\_\-quantity})\hspace{0.3cm}{\tt [inline]}}\label{classmo_linear_cooling_schedule_2fdde7b1520d5a41251627e81cc9c13d} Simple constructor. @@ -53,12 +53,12 @@ Simple constructor. \end{Desc} -Definition at line 31 of file mo\-Linear\-Cooling\-Schedule.h. +Definition at line 31 of file moLinearCoolingSchedule.h. \subsection{Member Function Documentation} -\index{moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}!operator()@{operator()}} -\index{operator()@{operator()}!moLinearCoolingSchedule@{mo\-Linear\-Cooling\-Schedule}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool mo\-Linear\-Cooling\-Schedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} +\index{moLinearCoolingSchedule@{moLinearCoolingSchedule}!operator()@{operator()}} +\index{operator()@{operator()}!moLinearCoolingSchedule@{moLinearCoolingSchedule}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}bool moLinearCoolingSchedule::operator() (double \& {\em \_\-\_\-temp})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_linear_cooling_schedule_814b109fdfd9426a92a5444b05014da3} Function which proceeds to the cooling. @@ -74,12 +74,12 @@ It decreases the temperature and indicates if it is greater than the threshold. \item[Returns:]if the new temperature (current temperature - quantity) is greater than the threshold. \end{Desc} -Implements {\bf eo\-UF$<$ double \&, bool $>$}. +Implements {\bf eoUF$<$ double \&, bool $>$}. -Definition at line 41 of file mo\-Linear\-Cooling\-Schedule.h. +Definition at line 41 of file moLinearCoolingSchedule.h. References quantity, and threshold. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Linear\-Cooling\-Schedule.h\end{CompactItemize} +moLinearCoolingSchedule.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_move.tex index 873616a4c..e178fa21e 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move.tex @@ -1,11 +1,11 @@ -\section{mo\-Move$<$ EOT $>$ Class Template Reference} +\section{moMove$<$ EOT $>$ Class Template Reference} \label{classmo_move}\index{moMove@{moMove}} Definition of a move. -{\tt \#include $<$mo\-Move.h$>$} +{\tt \#include $<$moMove.h$>$} -Inheritance diagram for mo\-Move$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moMove$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move} @@ -20,7 +20,7 @@ typedef EOT {\bf EOType}\label{classmo_move_7fb853a91ba1319530529e515380bbba} \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Move$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moMove$<$ EOT $>$} Definition of a move. @@ -28,8 +28,8 @@ A move transforms a solution to another close solution. It describes how a solut -Definition at line 23 of file mo\-Move.h. +Definition at line 23 of file moMove.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move.h\end{CompactItemize} +moMove.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex index 5d0b1e66b..0e4a7e621 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_expl.tex @@ -1,11 +1,11 @@ -\section{mo\-Move\-Expl$<$ M $>$ Class Template Reference} +\section{moMoveExpl$<$ M $>$ Class Template Reference} \label{classmo_move_expl}\index{moMoveExpl@{moMoveExpl}} -Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. -{\tt \#include $<$mo\-Move\-Expl.h$>$} +{\tt \#include $<$moMoveExpl.h$>$} -Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moMoveExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_expl} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Expl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Move\-Expl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moMoveExpl$<$ M $>$} -Description of a move (\doxyref{mo\-Move}{p.}{classmo_move}) explorer. +Description of a move (\doxyref{moMove}{p.}{classmo_move}) explorer. -Only a description...See \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. +Only a description...See \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file mo\-Move\-Expl.h. +Definition at line 21 of file moMoveExpl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Expl.h\end{CompactItemize} +moMoveExpl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex index 91421ef4b..85bba26c1 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_incr_eval.tex @@ -1,11 +1,11 @@ -\section{mo\-Move\-Incr\-Eval$<$ M $>$ Class Template Reference} +\section{moMoveIncrEval$<$ M $>$ Class Template Reference} \label{classmo_move_incr_eval}\index{moMoveIncrEval@{moMoveIncrEval}} (generally) Efficient evaluation function based a move and a solution. -{\tt \#include $<$mo\-Move\-Incr\-Eval.h$>$} +{\tt \#include $<$moMoveIncrEval.h$>$} -Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moMoveIncrEval$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_incr_eval} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-Move\-Incr\-Eval$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Move\-Incr\-Eval$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moMoveIncrEval$<$ M $>$} (generally) Efficient evaluation function based a move and a solution. @@ -22,8 +22,8 @@ From a move and a solution, it computes a new fitness that could be associated t -Definition at line 24 of file mo\-Move\-Incr\-Eval.h. +Definition at line 24 of file moMoveIncrEval.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Incr\-Eval.h\end{CompactItemize} +moMoveIncrEval.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex index 353911436..904ac7911 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_init.tex @@ -1,11 +1,11 @@ -\section{mo\-Move\-Init$<$ M $>$ Class Template Reference} +\section{moMoveInit$<$ M $>$ Class Template Reference} \label{classmo_move_init}\index{moMoveInit@{moMoveInit}} -Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. +Move (\doxyref{moMove}{p.}{classmo_move}) initializer. -{\tt \#include $<$mo\-Move\-Init.h$>$} +{\tt \#include $<$moMoveInit.h$>$} -Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moMoveInit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_move_init} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Init$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Move\-Init$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moMoveInit$<$ M $>$} -Move (\doxyref{mo\-Move}{p.}{classmo_move}) initializer. +Move (\doxyref{moMove}{p.}{classmo_move}) initializer. Class which allows to initiase a move. Only a description... An object that herits from this class needs to be designed to be used. -Definition at line 22 of file mo\-Move\-Init.h. +Definition at line 22 of file moMoveInit.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Init.h\end{CompactItemize} +moMoveInit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex index 1a6c5b997..15968268f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{mo\-Move\-Loop\-Expl$<$ M $>$ Class Template Reference} +\section{moMoveLoopExpl$<$ M $>$ Class Template Reference} \label{classmo_move_loop_expl}\index{moMoveLoopExpl@{moMoveLoopExpl}} Class which describes an iterative explorer. -{\tt \#include $<$mo\-Move\-Loop\-Expl.h$>$} +{\tt \#include $<$moMoveLoopExpl.h$>$} -Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4.59016cm]{classmo_move_loop_expl} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Move\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Move\-Loop\-Expl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moMoveLoopExpl$<$ M $>$} Class which describes an iterative explorer. -Only a description... \doxyref{mo\-HCMove\-Loop\-Expl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{mo\-Move\-Loop\-Expl}{p.}{classmo_move_loop_expl}. +Only a description... \doxyref{moHCMoveLoopExpl}{p.}{classmo_h_c_move_loop_expl} and \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} are exemples of class that are a \doxyref{moMoveLoopExpl}{p.}{classmo_move_loop_expl}. -Definition at line 21 of file mo\-Move\-Loop\-Expl.h. +Definition at line 21 of file moMoveLoopExpl.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Loop\-Expl.h\end{CompactItemize} +moMoveLoopExpl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex index 2ed02f91e..82d8378b7 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_move_select.tex @@ -1,11 +1,11 @@ -\section{mo\-Move\-Select$<$ M $>$ Class Template Reference} +\section{moMoveSelect$<$ M $>$ Class Template Reference} \label{classmo_move_select}\index{moMoveSelect@{moMoveSelect}} -Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). -{\tt \#include $<$mo\-Move\-Select.h$>$} +{\tt \#include $<$moMoveSelect.h$>$} -Inheritance diagram for mo\-Move\-Select$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moMoveSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=2.82828cm]{classmo_move_select} @@ -27,20 +27,20 @@ virtual bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\ \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Move\-Select$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moMoveSelect$<$ M $>$} -Class that describes a move selector (\doxyref{mo\-Move}{p.}{classmo_move}). +Class that describes a move selector (\doxyref{moMove}{p.}{classmo_move}). -It iteratively considers some moves (\doxyref{mo\-Move}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. +It iteratively considers some moves (\doxyref{moMove}{p.}{classmo_move}) and their associated fitnesses. The best move is so regularly updated. At any time, it could be accessed. -Definition at line 32 of file mo\-Move\-Select.h. +Definition at line 32 of file moMoveSelect.h. \subsection{Member Function Documentation} -\index{moMoveSelect@{mo\-Move\-Select}!init@{init}} -\index{init@{init}!moMoveSelect@{mo\-Move\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Move\-Select}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} +\index{moMoveSelect@{moMoveSelect}!init@{init}} +\index{init@{init}!moMoveSelect@{moMoveSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moMoveSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e} Procedure which initialises all that the move selector needs including the initial fitness. @@ -54,9 +54,9 @@ In order to know the fitness of the solution, for which the neighborhood will be \end{Desc} -Implemented in {\bf mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, {\bf mo\-First\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and {\bf mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{mo\-Move\-Select}!update@{update}} -\index{update@{update}!moMoveSelect@{mo\-Move\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf mo\-Move\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} +Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_2d2abf9aa17dc77cbb4f41810ab7b956}, {\bf moFirstImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_first_impr_select_4c5ce18ede46247a439c68f6954a4055}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9}.\index{moMoveSelect@{moMoveSelect}!update@{update}} +\index{update@{update}!moMoveSelect@{moMoveSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual bool {\bf moMoveSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_move_select_7c157b6e64fd417acf6e900059204eb1} Function which updates the best solutions. @@ -70,8 +70,8 @@ Function which updates the best solutions. \item[Returns:]a boolean that expresses the need to resume the exploration. \end{Desc} -Implemented in {\bf mo\-Best\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and {\bf mo\-Rand\-Impr\-Select$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. +Implemented in {\bf moBestImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_best_impr_select_d10e3e6f8a0277731e95ef506d064d6d}, and {\bf moRandImprSelect$<$ M $>$} \doxyref{}{p.}{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Move\-Select.h\end{CompactItemize} +moMoveSelect.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps index 08b997f12..dfda1c365 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 490.798 +%%BoundingBox: 0 0 500 316.206 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.01875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.58125 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moNextMove< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< M &, const M::EOType &, bool >) cw (eoFunctorBase) cw (moItRandNextMove< M >) cw /boxwidth boxwidth marginwidth 2 mul add def @@ -189,7 +189,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moNextMove< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< M &, const M::EOType &, bool >) 0 2 box (eoFunctorBase) 0 3 box (moItRandNextMove< M >) 0 0 box diff --git a/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex index 7da58dd8d..3fdea7d9d 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_next_move.tex @@ -1,11 +1,11 @@ -\section{mo\-Next\-Move$<$ M $>$ Class Template Reference} +\section{moNextMove$<$ M $>$ Class Template Reference} \label{classmo_next_move}\index{moNextMove@{moNextMove}} -Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). -{\tt \#include $<$mo\-Next\-Move.h$>$} +{\tt \#include $<$moNextMove.h$>$} -Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moNextMove$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_next_move} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Next\-Move$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Next\-Move$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moNextMove$<$ M $>$} -Class which allows to generate a new move (\doxyref{mo\-Move}{p.}{classmo_move}). +Class which allows to generate a new move (\doxyref{moMove}{p.}{classmo_move}). -Useful for the explorer (for \doxyref{mo\-TS}{p.}{classmo_t_s} or \doxyref{mo\-HC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. +Useful for the explorer (for \doxyref{moTS}{p.}{classmo_t_s} or \doxyref{moHC}{p.}{classmo_h_c}). Does nothing... An object that herits from this class needs to be designed for being used. -Definition at line 22 of file mo\-Next\-Move.h. +Definition at line 22 of file moNextMove.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Next\-Move.h\end{CompactItemize} +moNextMove.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps index f5d50a373..8bc333965 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 583.942 +%%BoundingBox: 0 0 500 239.521 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 0.85625 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 2.0875 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moNoAspirCrit< M >) cw (moAspirCrit< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType::Fitness &, bool >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moNoAspirCrit< M >) 0 0 box (moAspirCrit< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< const M &, const M::EOType::Fitness &, bool >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex index 53fcf3593..c9169ff46 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_no_aspir_crit.tex @@ -1,11 +1,11 @@ -\section{mo\-No\-Aspir\-Crit$<$ M $>$ Class Template Reference} +\section{moNoAspirCrit$<$ M $>$ Class Template Reference} \label{classmo_no_aspir_crit}\index{moNoAspirCrit@{moNoAspirCrit}} -One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). -{\tt \#include $<$mo\-No\-Aspir\-Crit.h$>$} +{\tt \#include $<$moNoAspirCrit.h$>$} -Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moNoAspirCrit$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_no_aspir_crit} @@ -17,24 +17,24 @@ Inheritance diagram for mo\-No\-Aspir\-Crit$<$ M $>$::\begin{figure}[H] bool {\bf operator()} (const M \&\_\-\_\-move, const typename M::EOType::Fitness \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which describes the aspiration criterion behaviour. \item\end{CompactList}\item void {\bf init} () -\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} +\begin{CompactList}\small\item\em Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-No\-Aspir\-Crit$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moNoAspirCrit$<$ M $>$} -One of the possible aspiration criterion (\doxyref{mo\-Aspir\-Crit}{p.}{classmo_aspir_crit}). +One of the possible aspiration criterion (\doxyref{moAspirCrit}{p.}{classmo_aspir_crit}). The simplest : never satisfied. -Definition at line 21 of file mo\-No\-Aspir\-Crit.h. +Definition at line 21 of file moNoAspirCrit.h. \subsection{Member Function Documentation} -\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!operator()@{operator()}} -\index{operator()@{operator()}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-No\-Aspir\-Crit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} +\index{moNoAspirCrit@{moNoAspirCrit}!operator()@{operator()}} +\index{operator()@{operator()}!moNoAspirCrit@{moNoAspirCrit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moNoAspirCrit}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const typename M::EOType::Fitness \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_no_aspir_crit_8a7180a8d5c25bfb6727d0b59551b0f8} Function which describes the aspiration criterion behaviour. @@ -50,19 +50,19 @@ Does nothing. \item[Returns:]FALSE. \end{Desc} -Definition at line 32 of file mo\-No\-Aspir\-Crit.h.\index{moNoAspirCrit@{mo\-No\-Aspir\-Crit}!init@{init}} -\index{init@{init}!moNoAspirCrit@{mo\-No\-Aspir\-Crit}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-No\-Aspir\-Crit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} +Definition at line 32 of file moNoAspirCrit.h.\index{moNoAspirCrit@{moNoAspirCrit}!init@{init}} +\index{init@{init}!moNoAspirCrit@{moNoAspirCrit}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moNoAspirCrit}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, private, virtual]}}\label{classmo_no_aspir_crit_f3a286fc4c2d36bd390ba9a3074f3037} -Procedure which initialises all that needs a \doxyref{mo\-No\-Aspir\-Crit}{p.}{classmo_no_aspir_crit}. +Procedure which initialises all that needs a \doxyref{moNoAspirCrit}{p.}{classmo_no_aspir_crit}. Nothing... -Implements {\bf mo\-Aspir\-Crit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. +Implements {\bf moAspirCrit$<$ M $>$} \doxyref{}{p.}{classmo_aspir_crit_a8ce84510a5ec7c9078381e542c6d140}. -Definition at line 43 of file mo\-No\-Aspir\-Crit.h. +Definition at line 43 of file moNoAspirCrit.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-No\-Aspir\-Crit.h\end{CompactItemize} +moNoAspirCrit.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex index 85252bd5e..965d745cd 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_impr_select.tex @@ -1,11 +1,11 @@ -\section{mo\-Rand\-Impr\-Select$<$ M $>$ Class Template Reference} +\section{moRandImprSelect$<$ M $>$ Class Template Reference} \label{classmo_rand_impr_select}\index{moRandImprSelect@{moRandImprSelect}} -One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). +One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). -{\tt \#include $<$mo\-Rand\-Impr\-Select.h$>$} +{\tt \#include $<$moRandImprSelect.h$>$} -Inheritance diagram for mo\-Rand\-Impr\-Select$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moRandImprSelect$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_rand_impr_select} @@ -21,10 +21,10 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_rand_impr_select_3bff2fdb \begin{CompactItemize} \item void {\bf init} (const {\bf Fitness} \&\_\-\_\-fit) -\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item +\begin{CompactList}\small\item\em Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. \item\end{CompactList}\item bool {\bf update} (const M \&\_\-\_\-move, const {\bf Fitness} \&\_\-\_\-fit) \begin{CompactList}\small\item\em Function that updates the fitness and move vectors. \item\end{CompactList}\item -void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (Empty\-Selection) +void {\bf operator()} (M \&\_\-\_\-move, {\bf Fitness} \&\_\-\_\-fit) throw (EmptySelection) \begin{CompactList}\small\item\em The move selection. \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} @@ -41,23 +41,23 @@ std::vector$<$ M $>$ {\bf vect\_\-better\_\-moves}\label{classmo_rand_impr_selec \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Rand\-Impr\-Select$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moRandImprSelect$<$ M $>$} -One of the possible \doxyref{mo\-Move}{p.}{classmo_move} selector (\doxyref{mo\-Move\-Select}{p.}{classmo_move_select}). +One of the possible \doxyref{moMove}{p.}{classmo_move} selector (\doxyref{moMoveSelect}{p.}{classmo_move_select}). All the neighbors are considered. One of them that enables an improvment of the objective function is choosen. -Definition at line 25 of file mo\-Rand\-Impr\-Select.h. +Definition at line 25 of file moRandImprSelect.h. \subsection{Member Function Documentation} -\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!init@{init}} -\index{init@{init}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} +\index{moRandImprSelect@{moRandImprSelect}!init@{init}} +\index{init@{init}!moRandImprSelect@{moRandImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::init (const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_a19726a1509cff874801615d63a3b5d9} -Procedure which all that needs a \doxyref{mo\-Rand\-Impr\-Select}{p.}{classmo_rand_impr_select}. +Procedure which all that needs a \doxyref{moRandImprSelect}{p.}{classmo_rand_impr_select}. Give a value to the initialise fitness. Clean the move and fitness vectors. @@ -68,13 +68,13 @@ Give a value to the initialise fitness. Clean the move and fitness vectors. \end{Desc} -Implements {\bf mo\-Move\-Select$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. +Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_bca4c43f13d26eca7163aeb272a4a52e}. -Definition at line 40 of file mo\-Rand\-Impr\-Select.h. +Definition at line 40 of file moRandImprSelect.h. -References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!update@{update}} -\index{update@{update}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} +References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!update@{update}} +\index{update@{update}!moRandImprSelect@{moRandImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moRandImprSelect}$<$ M $>$::update (const M \& {\em \_\-\_\-move}, const {\bf Fitness} \& {\em \_\-\_\-fit})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_60ae5548560caee7e28d5ed2446186c9} Function that updates the fitness and move vectors. @@ -90,13 +90,13 @@ if a move give a better fitness than the initial fitness, it is saved and the fi \item[Returns:]TRUE. \end{Desc} -Implements {\bf mo\-Move\-Select$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. +Implements {\bf moMoveSelect$<$ M $>$} \doxyref{}{p.}{classmo_move_select_7c157b6e64fd417acf6e900059204eb1}. -Definition at line 56 of file mo\-Rand\-Impr\-Select.h. +Definition at line 56 of file moRandImprSelect.h. -References mo\-Rand\-Impr\-Select$<$ M $>$::init\_\-fit, mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{mo\-Rand\-Impr\-Select}!operator()@{operator()}} -\index{operator()@{operator()}!moRandImprSelect@{mo\-Rand\-Impr\-Select}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Rand\-Impr\-Select}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf Empty\-Selection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} +References moRandImprSelect$<$ M $>$::init\_\-fit, moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves.\index{moRandImprSelect@{moRandImprSelect}!operator()@{operator()}} +\index{operator()@{operator()}!moRandImprSelect@{moRandImprSelect}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moRandImprSelect}$<$ M $>$::operator() (M \& {\em \_\-\_\-move}, {\bf Fitness} \& {\em \_\-\_\-fit}) throw ({\bf EmptySelection})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_rand_impr_select_5ee57f77a450c0a9ce50bfccf3ad2a55} The move selection. @@ -111,16 +111,16 @@ One the saved move is randomly chosen. \begin{Desc} \item[Exceptions:] \begin{description} -\item[{\em \doxyref{Empty\-Selection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} +\item[{\em \doxyref{EmptySelection}{p.}{class_empty_selection}}]If no move which improves the current fitness are found. \end{description} \end{Desc} -Implements {\bf eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>$}. +Implements {\bf eoBF$<$ M \&, M::EOType::Fitness \&, void $>$}. -Definition at line 77 of file mo\-Rand\-Impr\-Select.h. +Definition at line 77 of file moRandImprSelect.h. -References eo\-Rng::random(), mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-fit, and mo\-Rand\-Impr\-Select$<$ M $>$::vect\_\-better\_\-moves. +References eoRng::random(), moRandImprSelect$<$ M $>$::vect\_\-better\_\-fit, and moRandImprSelect$<$ M $>$::vect\_\-better\_\-moves. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Rand\-Impr\-Select.h\end{CompactItemize} +moRandImprSelect.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex index a35b6919a..665d27245 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_rand_move.tex @@ -1,11 +1,11 @@ -\section{mo\-Rand\-Move$<$ M $>$ Class Template Reference} +\section{moRandMove$<$ M $>$ Class Template Reference} \label{classmo_rand_move}\index{moRandMove@{moRandMove}} Random move generator. -{\tt \#include $<$mo\-Rand\-Move.h$>$} +{\tt \#include $<$moRandMove.h$>$} -Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moRandMove$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=3cm]{classmo_rand_move} @@ -14,16 +14,16 @@ Inheritance diagram for mo\-Rand\-Move$<$ M $>$::\begin{figure}[H] \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Rand\-Move$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moRandMove$<$ M $>$} Random move generator. -Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{mo\-SA}{p.}{classmo_s_a}. +Only a description... An object that herits from this class needs to be designed in order to use a \doxyref{moSA}{p.}{classmo_s_a}. -Definition at line 21 of file mo\-Rand\-Move.h. +Definition at line 21 of file moRandMove.h. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Rand\-Move.h\end{CompactItemize} +moRandMove.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex index 1a0bc79f2..1a8da4300 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_s_a.tex @@ -1,11 +1,11 @@ -\section{mo\-SA$<$ M $>$ Class Template Reference} +\section{moSA$<$ M $>$ Class Template Reference} \label{classmo_s_a}\index{moSA@{moSA}} Simulated Annealing (SA). -{\tt \#include $<$mo\-SA.h$>$} +{\tt \#include $<$moSA.h$>$} -Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moSA$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_s_a} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-SA$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf mo\-Cooling\-Schedule} \&\_\-\_\-cool\_\-sched, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moSA} ({\bf moRandMove}$<$ M $>$ \&\_\-\_\-move\_\-rand, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, double \_\-\_\-init\_\-temp, {\bf moCoolingSchedule} \&\_\-\_\-cool\_\-sched, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em SA constructor. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em function that launches the SA algorithm. \item\end{CompactList}\end{CompactItemize} @@ -30,28 +30,28 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_s_a_97f1a40d5ab5a0b3f878d0347b3 \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Rand\-Move}$<$ M $>$ \& {\bf move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} +{\bf moRandMove}$<$ M $>$ \& {\bf move\_\-rand}\label{classmo_s_a_71c49935b63a202d25888a5f86121fec} \begin{CompactList}\small\item\em A move generator (generally randomly). \item\end{CompactList}\item -{\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} +{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_s_a_4c3be32e9832e465b24e6d33559356bc} \begin{CompactList}\small\item\em A (generally) efficient evaluation function. \item\end{CompactList}\item -{\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} +{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_s_a_54484c8a514866ea496e0058c2e09716} \begin{CompactList}\small\item\em Stopping criterion before temperature update. \item\end{CompactList}\item double {\bf init\_\-temp}\label{classmo_s_a_f1af7636b52aa5f6b381f8187b667bd4} \begin{CompactList}\small\item\em Initial temperature. \item\end{CompactList}\item -{\bf mo\-Cooling\-Schedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} +{\bf moCoolingSchedule} \& {\bf cool\_\-sched}\label{classmo_s_a_11c7d0cab649b7d680dd85bb74cb4ff6} \begin{CompactList}\small\item\em The cooling schedule. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} +{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_s_a_bcd6a940046f23dd741444c0b85edf2c} \begin{CompactList}\small\item\em A full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-SA$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moSA$<$ M $>$} Simulated Annealing (SA). @@ -59,12 +59,12 @@ Class that describes a Simulated Annealing algorithm. -Definition at line 32 of file mo\-SA.h. +Definition at line 32 of file moSA.h. \subsection{Constructor \& Destructor Documentation} -\index{moSA@{mo\-SA}!moSA@{moSA}} -\index{moSA@{moSA}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-SA}$<$ M $>$::{\bf mo\-SA} ({\bf mo\-Rand\-Move}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf mo\-Cooling\-Schedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} +\index{moSA@{moSA}!moSA@{moSA}} +\index{moSA@{moSA}!moSA@{moSA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSA}$<$ M $>$::{\bf moSA} ({\bf moRandMove}$<$ M $>$ \& {\em \_\-\_\-move\_\-rand}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, double {\em \_\-\_\-init\_\-temp}, {\bf moCoolingSchedule} \& {\em \_\-\_\-cool\_\-sched}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_s_a_01f6a44483e5a7abbce33eb480b6a9b9} SA constructor. @@ -78,17 +78,17 @@ All the boxes used by a SA need to be given. \end{Desc} -Definition at line 60 of file mo\-SA.h. +Definition at line 60 of file moSA.h. \subsection{Member Function Documentation} -\index{moSA@{mo\-SA}!operator()@{operator()}} -\index{operator()@{operator()}!moSA@{mo\-SA}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-SA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} +\index{moSA@{moSA}!operator()@{operator()}} +\index{operator()@{operator()}!moSA@{moSA}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSA}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_s_a_0e4c54b57bc13fcbd4763883b8f719e5} function that launches the SA algorithm. -As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. +As a \doxyref{moTS}{p.}{classmo_t_s} or a \doxyref{moHC}{p.}{classmo_h_c}, the SA can be used for HYBRIDATION in an evolutionary algorithm. \begin{Desc} \item[Parameters:] @@ -99,12 +99,12 @@ As a \doxyref{mo\-TS}{p.}{classmo_t_s} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, t \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. +Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. -Definition at line 82 of file mo\-SA.h. +Definition at line 82 of file moSA.h. -References mo\-SA$<$ M $>$::cont, mo\-SA$<$ M $>$::cool\_\-sched, mo\-SA$<$ M $>$::full\_\-eval, mo\-SA$<$ M $>$::incr\_\-eval, mo\-SA$<$ M $>$::init\_\-temp, mo\-SA$<$ M $>$::move\_\-rand, and eo\-Rng::uniform(). +References moSA$<$ M $>$::cont, moSA$<$ M $>$::cool\_\-sched, moSA$<$ M $>$::full\_\-eval, moSA$<$ M $>$::incr\_\-eval, moSA$<$ M $>$::init\_\-temp, moSA$<$ M $>$::move\_\-rand, and eoRng::uniform(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-SA.h\end{CompactItemize} +moSA.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps index b0dcef476..95d9a8476 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 427.807 +%%BoundingBox: 0 0 500 277.778 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.16875 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleMoveTabuList< M >) cw (moTabuList< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType &, bool >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleMoveTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< const M &, const M::EOType &, bool >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex index 25226c571..d80f3328b 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_move_tabu_list.tex @@ -1,11 +1,11 @@ -\section{mo\-Simple\-Move\-Tabu\-List$<$ M $>$ Class Template Reference} +\section{moSimpleMoveTabuList$<$ M $>$ Class Template Reference} \label{classmo_simple_move_tabu_list}\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}} Class describing a move tabu list with a limited memory. -{\tt \#include $<$mo\-Simple\-Move\-Tabu\-List.h$>$} +{\tt \#include $<$moSimpleMoveTabuList.h$>$} -Inheritance diagram for mo\-Simple\-Move\-Tabu\-List$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moSimpleMoveTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_move_tabu_list} @@ -20,7 +20,7 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_move_tabu_list_91286ff3ba6b1e9e \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Simple\-Move\-Tabu\-List} (unsigned \_\-\_\-size)\label{classmo_simple_move_tabu_list_d29bb1cfc8d1fd2de1cccf821d066b66} +{\bf moSimpleMoveTabuList} (unsigned int \_\-\_\-size)\label{classmo_simple_move_tabu_list_12798ce0bc3a2ee031fb301290ed6d79} \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) @@ -34,35 +34,35 @@ void {\bf init} () \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf remove\-Move} (const M \&\_\-\_\-move) +void {\bf removeMove} (const M \&\_\-\_\-move) \begin{CompactList}\small\item\em Procedure that removes a given move from the tabu list (if it is into, else do nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned {\bf max\-Size}\label{classmo_simple_move_tabu_list_9f4860b378366e774c61a0d2034811e1} +unsigned int {\bf maxSize}\label{classmo_simple_move_tabu_list_e48848e9e5c9c8435475cbdf21658e23} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned {\bf current\-Size}\label{classmo_simple_move_tabu_list_bd417b084e01343cba914a8193dab3a1} +unsigned int {\bf currentSize}\label{classmo_simple_move_tabu_list_f1f9524e62d48f3688aa58a6055ccceb} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ M $>$ {\bf tabu\-List}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} +std::list$<$ M $>$ {\bf tabuList}\label{classmo_simple_move_tabu_list_d91bc838361524720616b44eda9b2c3a} \begin{CompactList}\small\item\em The move tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Simple\-Move\-Tabu\-List$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moSimpleMoveTabuList$<$ M $>$} Class describing a move tabu list with a limited memory. -Definition at line 22 of file mo\-Simple\-Move\-Tabu\-List.h. +Definition at line 22 of file moSimpleMoveTabuList.h. \subsection{Member Function Documentation} -\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!operator()@{operator()}} -\index{operator()@{operator()}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} +\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleMoveTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_bb7fe9da28617f56734af71c42c8265a} Function that indicates if, in a given state, the \_\-move is tabu or not. @@ -70,17 +70,19 @@ Function that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Definition at line 46 of file mo\-Simple\-Move\-Tabu\-List.h. +Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. -References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!add@{add}} -\index{add@{add}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} +Definition at line 46 of file moSimpleMoveTabuList.h. + +References moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!add@{add}} +\index{add@{add}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef} Procedure to add a move in the tabu list. @@ -94,35 +96,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 60 of file mo\-Simple\-Move\-Tabu\-List.h. +Definition at line 60 of file moSimpleMoveTabuList.h. -References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Move\-Tabu\-List$<$ M $>$::remove\-Move(), and mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!update@{update}} -\index{update@{update}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} +References moSimpleMoveTabuList$<$ M $>$::currentSize, moSimpleMoveTabuList$<$ M $>$::maxSize, moSimpleMoveTabuList$<$ M $>$::removeMove(), and moSimpleMoveTabuList$<$ M $>$::tabuList.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!update@{update}} +\index{update@{update}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 82 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!init@{init}} -\index{init@{init}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} +Definition at line 82 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!init@{init}} +\index{init@{init}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 88 of file mo\-Simple\-Move\-Tabu\-List.h.\index{moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}!removeMove@{removeMove}} -\index{removeMove@{removeMove}!moSimpleMoveTabuList@{mo\-Simple\-Move\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Move\-Tabu\-List}$<$ M $>$::remove\-Move (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} +Definition at line 88 of file moSimpleMoveTabuList.h.\index{moSimpleMoveTabuList@{moSimpleMoveTabuList}!removeMove@{removeMove}} +\index{removeMove@{removeMove}!moSimpleMoveTabuList@{moSimpleMoveTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleMoveTabuList}$<$ M $>$::removeMove (const M \& {\em \_\-\_\-move})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_move_tabu_list_a3fa2bd19e09f1541878fa28e867d20f} Procedure that removes a given move from the tabu list (if it is into, else do nothing). @@ -130,16 +132,16 @@ Procedure that removes a given move from the tabu list (if it is into, else do n \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \end{description} \end{Desc} -Definition at line 100 of file mo\-Simple\-Move\-Tabu\-List.h. +Definition at line 100 of file moSimpleMoveTabuList.h. -References mo\-Simple\-Move\-Tabu\-List$<$ M $>$::tabu\-List. +References moSimpleMoveTabuList$<$ M $>$::tabuList. -Referenced by mo\-Simple\-Move\-Tabu\-List$<$ M $>$::add(). +Referenced by moSimpleMoveTabuList$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Simple\-Move\-Tabu\-List.h\end{CompactItemize} +moSimpleMoveTabuList.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps index 06f8e8fc5..c673817e4 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 400 +%%BoundingBox: 0 0 500 277.778 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 1.25 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 1.8 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -175,7 +175,7 @@ boxfont setfont 1 boundaspect scale (moSimpleSolutionTabuList< M >) cw (moTabuList< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType &, bool >) cw (eoFunctorBase) cw /boxwidth boxwidth marginwidth 2 mul add def /xspacing boxwidth distx add def @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale (moSimpleSolutionTabuList< M >) 0 0 box (moTabuList< M >) 0 1 box - (eoBF< A1, A2, R >) 0 2 box + (eoBF< const M &, const M::EOType &, bool >) 0 2 box (eoFunctorBase) 0 3 box % ----- relations ----- diff --git a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex index 878018c0c..9437723d9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_simple_solution_tabu_list.tex @@ -1,11 +1,11 @@ -\section{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$ Class Template Reference} +\section{moSimpleSolutionTabuList$<$ M $>$ Class Template Reference} \label{classmo_simple_solution_tabu_list}\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} Class describing a solution tabu list with limited length. -{\tt \#include $<$mo\-Simple\-Solution\-Tabu\-List.h$>$} +{\tt \#include $<$moSimpleSolutionTabuList.h$>$} -Inheritance diagram for mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moSimpleSolutionTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_simple_solution_tabu_list} @@ -20,7 +20,7 @@ typedef M::EOType {\bf EOT}\label{classmo_simple_solution_tabu_list_881060871a6b \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-Simple\-Solution\-Tabu\-List} (unsigned \_\-\_\-size) +{\bf moSimpleSolutionTabuList} (unsigned int \_\-\_\-size) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item bool {\bf operator()} (const M \&\_\-\_\-move, const {\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function that indicates if, in a given state, the \_\-move is tabu or not. \item\end{CompactList}\item @@ -33,35 +33,35 @@ void {\bf init} () \subsection*{Private Member Functions} \begin{CompactItemize} \item -void {\bf remove\-Solution} (const {\bf EOT} \&\_\-\_\-sol) +void {\bf removeSolution} (const {\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Procedure that removes a given solution from the tabu list (if it is into, else does nothing). \item\end{CompactList}\end{CompactItemize} \subsection*{Private Attributes} \begin{CompactItemize} \item -unsigned {\bf max\-Size}\label{classmo_simple_solution_tabu_list_d059072e23ba086ede801abdd32f7218} +unsigned int {\bf maxSize}\label{classmo_simple_solution_tabu_list_662e1f65fadff234692be009a2440845} \begin{CompactList}\small\item\em The maximum size of the tabu list. \item\end{CompactList}\item -unsigned {\bf current\-Size}\label{classmo_simple_solution_tabu_list_ddc7196b9adcba0081810619a978490c} +unsigned int {\bf currentSize}\label{classmo_simple_solution_tabu_list_2aaf6e882d10495adddae94cb7a48fbf} \begin{CompactList}\small\item\em The current size of the tabu list. \item\end{CompactList}\item -std::list$<$ {\bf EOT} $>$ {\bf tabu\-List}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} +std::list$<$ {\bf EOT} $>$ {\bf tabuList}\label{classmo_simple_solution_tabu_list_75df9cd683528d3722d02bac407b710b} \begin{CompactList}\small\item\em The solution tabu list. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moSimpleSolutionTabuList$<$ M $>$} Class describing a solution tabu list with limited length. -Definition at line 22 of file mo\-Simple\-Solution\-Tabu\-List.h. +Definition at line 22 of file moSimpleSolutionTabuList.h. \subsection{Constructor \& Destructor Documentation} -\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} -\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::{\bf mo\-Simple\-Solution\-Tabu\-List} (unsigned {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_24576bd9a907b8925c7d7d5ce6fde445} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moSimpleSolutionTabuList}$<$ M $>$::{\bf moSimpleSolutionTabuList} (unsigned int {\em \_\-\_\-size})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_8f8ce82b49ff49efbd934cedd3e34178} Constructor. @@ -73,14 +73,14 @@ Constructor. \end{Desc} -Definition at line 34 of file mo\-Simple\-Solution\-Tabu\-List.h. +Definition at line 34 of file moSimpleSolutionTabuList.h. -References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size. +References moSimpleSolutionTabuList$<$ M $>$::currentSize. \subsection{Member Function Documentation} -\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!operator()@{operator()}} -\index{operator()@{operator()}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} +\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!operator()@{operator()}} +\index{operator()@{operator()}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moSimpleSolutionTabuList}$<$ M $>$::operator() (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_e1f1cf258b55554d8be88fb5780a0047} Function that indicates if, in a given state, the \_\-move is tabu or not. @@ -88,17 +88,19 @@ Function that indicates if, in a given state, the \_\-move is tabu or not. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move}]A given \doxyref{mo\-Move}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} +\item[{\em \_\-\_\-move}]A given \doxyref{moMove}{p.}{classmo_move}. \item[{\em \_\-\_\-sol}]A solution. \end{description} \end{Desc} \begin{Desc} \item[Returns:]true or false. \end{Desc} -Definition at line 45 of file mo\-Simple\-Solution\-Tabu\-List.h. +Implements {\bf eoBF$<$ const M \&, const M::EOType \&, bool $>$}. -References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!add@{add}} -\index{add@{add}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} +Definition at line 45 of file moSimpleSolutionTabuList.h. + +References moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!add@{add}} +\index{add@{add}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615} Procedure to add a move in the tabu list. @@ -112,35 +114,35 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286}. -Definition at line 64 of file mo\-Simple\-Solution\-Tabu\-List.h. +Definition at line 64 of file moSimpleSolutionTabuList.h. -References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::current\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::max\-Size, mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::remove\-Solution(), and mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!update@{update}} -\index{update@{update}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} +References moSimpleSolutionTabuList$<$ M $>$::currentSize, moSimpleSolutionTabuList$<$ M $>$::maxSize, moSimpleSolutionTabuList$<$ M $>$::removeSolution(), and moSimpleSolutionTabuList$<$ M $>$::tabuList.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!update@{update}} +\index{update@{update}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca}. -Definition at line 91 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!init@{init}} -\index{init@{init}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} +Definition at line 91 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!init@{init}} +\index{init@{init}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implements {\bf mo\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. +Implements {\bf moTabuList$<$ M $>$} \doxyref{}{p.}{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57}. -Definition at line 97 of file mo\-Simple\-Solution\-Tabu\-List.h.\index{moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}!removeSolution@{removeSolution}} -\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{mo\-Simple\-Solution\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-Simple\-Solution\-Tabu\-List}$<$ M $>$::remove\-Solution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} +Definition at line 97 of file moSimpleSolutionTabuList.h.\index{moSimpleSolutionTabuList@{moSimpleSolutionTabuList}!removeSolution@{removeSolution}} +\index{removeSolution@{removeSolution}!moSimpleSolutionTabuList@{moSimpleSolutionTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moSimpleSolutionTabuList}$<$ M $>$::removeSolution (const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, private]}}\label{classmo_simple_solution_tabu_list_7847a48f33c15e31298f3e715d754560} Procedure that removes a given solution from the tabu list (if it is into, else does nothing). @@ -152,12 +154,12 @@ Procedure that removes a given solution from the tabu list (if it is into, else \end{Desc} -Definition at line 109 of file mo\-Simple\-Solution\-Tabu\-List.h. +Definition at line 109 of file moSimpleSolutionTabuList.h. -References mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::tabu\-List. +References moSimpleSolutionTabuList$<$ M $>$::tabuList. -Referenced by mo\-Simple\-Solution\-Tabu\-List$<$ M $>$::add(). +Referenced by moSimpleSolutionTabuList$<$ M $>$::add(). The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Simple\-Solution\-Tabu\-List.h\end{CompactItemize} +moSimpleSolutionTabuList.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex index 457ef3ba7..bc98d68d9 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_sol_continue.tex @@ -1,11 +1,11 @@ -\section{mo\-Sol\-Continue$<$ EOT $>$ Class Template Reference} +\section{moSolContinue$<$ EOT $>$ Class Template Reference} \label{classmo_sol_continue}\index{moSolContinue@{moSolContinue}} Class that describes a stop criterion for a solution-based heuristic. -{\tt \#include $<$mo\-Sol\-Continue.h$>$} +{\tt \#include $<$moSolContinue.h$>$} -Inheritance diagram for mo\-Sol\-Continue$<$ EOT $>$::\begin{figure}[H] +Inheritance diagram for moSolContinue$<$ EOT $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=4cm]{classmo_sol_continue} @@ -19,28 +19,28 @@ virtual void {\bf init} ()=0 \subsection{Detailed Description} -\subsubsection*{template$<$class EOT$>$ class mo\-Sol\-Continue$<$ EOT $>$} +\subsubsection*{template$<$class EOT$>$ class moSolContinue$<$ EOT $>$} Class that describes a stop criterion for a solution-based heuristic. -It allows to add an initialisation procedure to an object that is a unary function ({\bf eo\-UF}). +It allows to add an initialisation procedure to an object that is a unary function ({\bf eoUF}). -Definition at line 22 of file mo\-Sol\-Continue.h. +Definition at line 22 of file moSolContinue.h. \subsection{Member Function Documentation} -\index{moSolContinue@{mo\-Sol\-Continue}!init@{init}} -\index{init@{init}!moSolContinue@{mo\-Sol\-Continue}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf mo\-Sol\-Continue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} +\index{moSolContinue@{moSolContinue}!init@{init}} +\index{init@{init}!moSolContinue@{moSolContinue}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class EOT$>$ virtual void {\bf moSolContinue}$<$ EOT $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_sol_continue_064dc966a210f4ffb9515be3f03ca4c7} Procedure which initialises all that the stop criterion needs. Generally, it allocates some data structures or initialises some counters. -Implemented in {\bf mo\-Gen\-Sol\-Continue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. +Implemented in {\bf moGenSolContinue$<$ EOT $>$} \doxyref{}{p.}{classmo_gen_sol_continue_6c5db8182157584b56507cc9075602d4}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Sol\-Continue.h\end{CompactItemize} +moSolContinue.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex index 08c652ad2..a64996f1f 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s.tex @@ -1,11 +1,11 @@ -\section{mo\-TS$<$ M $>$ Class Template Reference} +\section{moTS$<$ M $>$ Class Template Reference} \label{classmo_t_s}\index{moTS@{moTS}} Tabu Search (TS). -{\tt \#include $<$mo\-TS.h$>$} +{\tt \#include $<$moTS.h$>$} -Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moTS$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s} @@ -14,9 +14,9 @@ Inheritance diagram for mo\-TS$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) -\begin{CompactList}\small\item\em Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item -{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) +\begin{CompactList}\small\item\em Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. \item\end{CompactList}\item +{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \&\_\-\_\-move\_\-expl, {\bf moSolContinue}$<$ {\bf EOT} $>$ \&\_\-\_\-cont, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \&\_\-\_\-full\_\-eval) \begin{CompactList}\small\item\em Constructor with less parameters. \item\end{CompactList}\item bool {\bf operator()} ({\bf EOT} \&\_\-\_\-sol) \begin{CompactList}\small\item\em Function which launchs the Tabu Search. \item\end{CompactList}\end{CompactItemize} @@ -32,19 +32,19 @@ typedef EOT::Fitness {\bf Fitness}\label{classmo_t_s_aa0eefbb17111422e495d1255f8 \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Move\-Expl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} +{\bf moMoveExpl}$<$ M $>$ \& {\bf move\_\-expl}\label{classmo_t_s_06914ddc90ca96e9158c8dbe182a7865} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} +{\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\bf cont}\label{classmo_t_s_969371cd2202f3d29cbb426f57ac7d3a} \begin{CompactList}\small\item\em Stop criterion. \item\end{CompactList}\item -{\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} +{\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\bf full\_\-eval}\label{classmo_t_s_fb67eddae5d0bfca4ed881995523231e} \begin{CompactList}\small\item\em Full evaluation function. \item\end{CompactList}\end{CompactItemize} \subsection*{Static Private Attributes} \begin{CompactItemize} \item -static bool {\bf first\_\-time}\label{classmo_t_s_564bc1969548ccbd9bb7e76f92898de0} +static bool {\bf first\_\-time} = true\label{classmo_t_s_564bc1969548ccbd9bb7e76f92898de0} \begin{CompactList}\small\item\em Boolean allowing to initialise the ptread\_\-mutex\_\-t in the constructor. \item\end{CompactList}\item static pthread\_\-mutex\_\-t {\bf mutex}\label{classmo_t_s_688f9ba42eb33cae6431f4f4eb65b9e9} @@ -53,7 +53,7 @@ static pthread\_\-mutex\_\-t {\bf mutex}\label{classmo_t_s_688f9ba42eb33cae6431f \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-TS$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moTS$<$ M $>$} Tabu Search (TS). @@ -61,17 +61,17 @@ Generic algorithm that describes a tabu search. -Definition at line 30 of file mo\-TS.h. +Definition at line 30 of file moTS.h. \subsection{Constructor \& Destructor Documentation} -\index{moTS@{mo\-TS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} +\index{moTS@{moTS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{moTS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_2be23f4524733ee6f37b71310d76407e} -Constructor of a \doxyref{mo\-TS}{p.}{classmo_t_s} specifying all the boxes. +Constructor of a \doxyref{moTS}{p.}{classmo_t_s} specifying all the boxes. -In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl} is instanciated. +In this constructor, a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl} is instanciated. \begin{Desc} \item[Parameters:] @@ -80,11 +80,11 @@ In this constructor, a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loo \end{Desc} -Definition at line 59 of file mo\-TS.h. +Definition at line 59 of file moTS.h. -References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex.\index{moTS@{mo\-TS}!moTS@{moTS}} -\index{moTS@{moTS}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TS}$<$ M $>$::{\bf mo\-TS} ({\bf mo\-Move\-Expl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf mo\-Sol\-Continue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eo\-Eval\-Func}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} +References moTS$<$ M $>$::first\_\-time, and moTS$<$ M $>$::mutex.\index{moTS@{moTS}!moTS@{moTS}} +\index{moTS@{moTS}!moTS@{moTS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTS}$<$ M $>$::{\bf moTS} ({\bf moMoveExpl}$<$ M $>$ \& {\em \_\-\_\-move\_\-expl}, {\bf moSolContinue}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-cont}, {\bf eoEvalFunc}$<$ {\bf EOT} $>$ \& {\em \_\-\_\-full\_\-eval})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_508e675c4232cf2ca06dded931c90bab} Constructor with less parameters. @@ -94,23 +94,23 @@ The explorer is given in the parameters. \begin{Desc} \item[Parameters:] \begin{description} -\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{mo\-TSMove\-Loop\-Expl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} +\item[{\em \_\-\_\-move\_\-expl}]the explorer (generally different that a \doxyref{moTSMoveLoopExpl}{p.}{classmo_t_s_move_loop_expl}) \item[{\em \_\-\_\-cont}]stop criterion \item[{\em \_\-\_\-full\_\-eval}]full evaluation function \end{description} \end{Desc} -Definition at line 81 of file mo\-TS.h. +Definition at line 81 of file moTS.h. -References mo\-TS$<$ M $>$::first\_\-time, and mo\-TS$<$ M $>$::mutex. +References moTS$<$ M $>$::first\_\-time, and moTS$<$ M $>$::mutex. \subsection{Member Function Documentation} -\index{moTS@{mo\-TS}!operator()@{operator()}} -\index{operator()@{operator()}!moTS@{mo\-TS}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf mo\-TS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} +\index{moTS@{moTS}!operator()@{operator()}} +\index{operator()@{operator()}!moTS@{moTS}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ bool {\bf moTS}$<$ M $>$::operator() ({\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_94d25a76fe1bc9ef0bbd0358ff55aceb} Function which launchs the Tabu Search. -Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyref{mo\-HC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. +Algorithm of the tabu search. As a \doxyref{moSA}{p.}{classmo_s_a} or a \doxyref{moHC}{p.}{classmo_h_c}, it can be used for HYBRIDATION in an evolutionary algorithm. For security a lock (pthread\_\-mutex\_\-t) is closed during the algorithm. \begin{Desc} \item[Parameters:] @@ -121,12 +121,12 @@ Algorithm of the tabu search. As a \doxyref{mo\-SA}{p.}{classmo_s_a} or a \doxyr \item[Returns:]TRUE. \end{Desc} -Implements {\bf eo\-UF$<$ M::EOType \&, bool $>$}. +Implements {\bf eoUF$<$ M::EOType \&, bool $>$}. -Definition at line 104 of file mo\-TS.h. +Definition at line 104 of file moTS.h. -References mo\-TS$<$ M $>$::cont, mo\-TS$<$ M $>$::full\_\-eval, mo\-TS$<$ M $>$::move\_\-expl, and mo\-TS$<$ M $>$::mutex. +References moTS$<$ M $>$::cont, moTS$<$ M $>$::full\_\-eval, moTS$<$ M $>$::move\_\-expl, and moTS$<$ M $>$::mutex. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-TS.h\end{CompactItemize} +moTS.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex index 40aeadccd..2a5d367c6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_t_s_move_loop_expl.tex @@ -1,11 +1,11 @@ -\section{mo\-TSMove\-Loop\-Expl$<$ M $>$ Class Template Reference} +\section{moTSMoveLoopExpl$<$ M $>$ Class Template Reference} \label{classmo_t_s_move_loop_expl}\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}} Explorer for a Tabu Search algorithm. -{\tt \#include $<$mo\-TSMove\-Loop\-Expl.h$>$} +{\tt \#include $<$moTSMoveLoopExpl.h$>$} -Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moTSMoveLoopExpl$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode \includegraphics[height=5cm]{classmo_t_s_move_loop_expl} @@ -14,7 +14,7 @@ Inheritance diagram for mo\-TSMove\-Loop\-Expl$<$ M $>$::\begin{figure}[H] \subsection*{Public Member Functions} \begin{CompactItemize} \item -{\bf mo\-TSMove\-Loop\-Expl} ({\bf mo\-Move\-Init}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf mo\-Next\-Move}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf mo\-Tabu\-List}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf mo\-Aspir\-Crit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) +{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \&\_\-\_\-move\_\-init, {\bf moNextMove}$<$ M $>$ \&\_\-\_\-next\_\-move, {\bf moMoveIncrEval}$<$ M $>$ \&\_\-\_\-incr\_\-eval, {\bf moTabuList}$<$ M $>$ \&\_\-\_\-tabu\_\-list, {\bf moAspirCrit}$<$ M $>$ \&\_\-\_\-aspir\_\-crit) \begin{CompactList}\small\item\em Constructor. \item\end{CompactList}\item void {\bf operator()} (const {\bf EOT} \&\_\-\_\-old\_\-sol, {\bf EOT} \&\_\-\_\-new\_\-sol) \begin{CompactList}\small\item\em Procedure which lauches the exploration. \item\end{CompactList}\end{CompactItemize} @@ -30,41 +30,41 @@ typedef M::EOType::Fitness {\bf Fitness}\label{classmo_t_s_move_loop_expl_a1ba36 \subsection*{Private Attributes} \begin{CompactItemize} \item -{\bf mo\-Move\-Init}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} +{\bf moMoveInit}$<$ M $>$ \& {\bf move\_\-init}\label{classmo_t_s_move_loop_expl_6b23f99648902fb72ed17a4a6fa4e400} \begin{CompactList}\small\item\em Move initialisation. \item\end{CompactList}\item -{\bf mo\-Next\-Move}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} +{\bf moNextMove}$<$ M $>$ \& {\bf next\_\-move}\label{classmo_t_s_move_loop_expl_aeeff6666d26ff5c67acd9c153a5ae49} \begin{CompactList}\small\item\em Neighborhood explorer. \item\end{CompactList}\item -{\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} +{\bf moMoveIncrEval}$<$ M $>$ \& {\bf incr\_\-eval}\label{classmo_t_s_move_loop_expl_ee4443fc8e45d840697619678628c26c} \begin{CompactList}\small\item\em Efficient evaluation. \item\end{CompactList}\item -{\bf mo\-Best\-Impr\-Select}$<$ M $>$ {\bf move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} +{\bf moBestImprSelect}$<$ M $>$ {\bf move\_\-select}\label{classmo_t_s_move_loop_expl_35a3f3035fb8df875c281d9838904bf1} \begin{CompactList}\small\item\em Move selector. \item\end{CompactList}\item -{\bf mo\-Tabu\-List}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} +{\bf moTabuList}$<$ M $>$ \& {\bf tabu\_\-list}\label{classmo_t_s_move_loop_expl_0e5988a940ba218e87c53b7e56d79790} \begin{CompactList}\small\item\em Tabu list. \item\end{CompactList}\item -{\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\bf aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} +{\bf moAspirCrit}$<$ M $>$ \& {\bf aspir\_\-crit}\label{classmo_t_s_move_loop_expl_6786cf5422d17cbf872b07ae74ca6b0f} \begin{CompactList}\small\item\em Aspiration criterion. \item\end{CompactList}\end{CompactItemize} \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-TSMove\-Loop\-Expl$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moTSMoveLoopExpl$<$ M $>$} Explorer for a Tabu Search algorithm. -It is used by a \doxyref{mo\-TS}{p.}{classmo_t_s}. +It is used by a \doxyref{moTS}{p.}{classmo_t_s}. -Definition at line 30 of file mo\-TSMove\-Loop\-Expl.h. +Definition at line 30 of file moTSMoveLoopExpl.h. \subsection{Constructor \& Destructor Documentation} -\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} -\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::{\bf mo\-TSMove\-Loop\-Expl} ({\bf mo\-Move\-Init}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf mo\-Next\-Move}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf mo\-Move\-Incr\-Eval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf mo\-Tabu\-List}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf mo\-Aspir\-Crit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} +\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} +\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ {\bf moTSMoveLoopExpl}$<$ M $>$::{\bf moTSMoveLoopExpl} ({\bf moMoveInit}$<$ M $>$ \& {\em \_\-\_\-move\_\-init}, {\bf moNextMove}$<$ M $>$ \& {\em \_\-\_\-next\_\-move}, {\bf moMoveIncrEval}$<$ M $>$ \& {\em \_\-\_\-incr\_\-eval}, {\bf moTabuList}$<$ M $>$ \& {\em \_\-\_\-tabu\_\-list}, {\bf moAspirCrit}$<$ M $>$ \& {\em \_\-\_\-aspir\_\-crit})\hspace{0.3cm}{\tt [inline]}}\label{classmo_t_s_move_loop_expl_43306dae9df150a8d9dc0dec9cd6a381} Constructor. @@ -76,14 +76,14 @@ Constructor. \end{Desc} -Definition at line 49 of file mo\-TSMove\-Loop\-Expl.h. +Definition at line 49 of file moTSMoveLoopExpl.h. -References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. +References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. \subsection{Member Function Documentation} -\index{moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}!operator()@{operator()}} -\index{operator()@{operator()}!moTSMoveLoopExpl@{mo\-TSMove\-Loop\-Expl}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf mo\-TSMove\-Loop\-Expl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} +\index{moTSMoveLoopExpl@{moTSMoveLoopExpl}!operator()@{operator()}} +\index{operator()@{operator()}!moTSMoveLoopExpl@{moTSMoveLoopExpl}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ void {\bf moTSMoveLoopExpl}$<$ M $>$::operator() (const {\bf EOT} \& {\em \_\-\_\-old\_\-sol}, {\bf EOT} \& {\em \_\-\_\-new\_\-sol})\hspace{0.3cm}{\tt [inline, virtual]}}\label{classmo_t_s_move_loop_expl_f601bbd0ccc41d6fbe3df9fcd87ad9e7} Procedure which lauches the exploration. @@ -97,12 +97,12 @@ The exploration continues while the chosen move is not in the tabu list or the a \end{Desc} -Implements {\bf eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>$}. +Implements {\bf eoBF$<$ const M::EOType \&, M::EOType \&, void $>$}. -Definition at line 69 of file mo\-TSMove\-Loop\-Expl.h. +Definition at line 69 of file moTSMoveLoopExpl.h. -References mo\-TSMove\-Loop\-Expl$<$ M $>$::aspir\_\-crit, mo\-TSMove\-Loop\-Expl$<$ M $>$::incr\_\-eval, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-init, mo\-TSMove\-Loop\-Expl$<$ M $>$::move\_\-select, mo\-TSMove\-Loop\-Expl$<$ M $>$::next\_\-move, and mo\-TSMove\-Loop\-Expl$<$ M $>$::tabu\_\-list. +References moTSMoveLoopExpl$<$ M $>$::aspir\_\-crit, moTSMoveLoopExpl$<$ M $>$::incr\_\-eval, moTSMoveLoopExpl$<$ M $>$::move\_\-init, moTSMoveLoopExpl$<$ M $>$::move\_\-select, moTSMoveLoopExpl$<$ M $>$::next\_\-move, and moTSMoveLoopExpl$<$ M $>$::tabu\_\-list. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-TSMove\-Loop\-Expl.h\end{CompactItemize} +moTSMoveLoopExpl.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps index 43c125a8a..2aee2f1b6 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.eps @@ -5,7 +5,7 @@ %%For: %Magnification: 1.00 %%Orientation: Portrait -%%BoundingBox: 0 0 500 200 +%%BoundingBox: 0 0 500 138.889 %%Pages: 0 %%BeginSetup %%EndSetup @@ -19,7 +19,7 @@ /marginwidth 10 def /distx 20 def /disty 40 def -/boundaspect 2.5 def % aspect ratio of the BoundingBox (width/height) +/boundaspect 3.6 def % aspect ratio of the BoundingBox (width/height) /boundx 500 def /boundy boundx boundaspect div def /xspacing 0 def @@ -174,7 +174,7 @@ boxfont setfont 1 boundaspect scale (moTabuList< M >) cw -(eoBF< A1, A2, R >) cw +(eoBF< const M &, const M::EOType &, bool >) cw (eoFunctorBase) cw (moSimpleMoveTabuList< M >) cw (moSimpleSolutionTabuList< M >) cw @@ -190,7 +190,7 @@ boundx scalefactor div boundy scalefactor div scale % ----- classes ----- (moTabuList< M >) 0.5 1 box - (eoBF< A1, A2, R >) 0.5 2 box + (eoBF< const M &, const M::EOType &, bool >) 0.5 2 box (eoFunctorBase) 0.5 3 box (moSimpleMoveTabuList< M >) 0 0 box (moSimpleSolutionTabuList< M >) 1 0 box diff --git a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex index f7ba606a0..1ed7c1b47 100644 --- a/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex +++ b/trunk/paradiseo-mo/docs/latex/classmo_tabu_list.tex @@ -1,14 +1,14 @@ -\section{mo\-Tabu\-List$<$ M $>$ Class Template Reference} +\section{moTabuList$<$ M $>$ Class Template Reference} \label{classmo_tabu_list}\index{moTabuList@{moTabuList}} -Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. -{\tt \#include $<$mo\-Tabu\-List.h$>$} +{\tt \#include $<$moTabuList.h$>$} -Inheritance diagram for mo\-Tabu\-List$<$ M $>$::\begin{figure}[H] +Inheritance diagram for moTabuList$<$ M $>$::\begin{figure}[H] \begin{center} \leavevmode -\includegraphics[height=4cm]{classmo_tabu_list} +\includegraphics[height=3.88889cm]{classmo_tabu_list} \end{center} \end{figure} \subsection*{Public Types} @@ -29,20 +29,20 @@ virtual void {\bf init} ()=0 \subsection{Detailed Description} -\subsubsection*{template$<$class M$>$ class mo\-Tabu\-List$<$ M $>$} +\subsubsection*{template$<$class M$>$ class moTabuList$<$ M $>$} -Class describing a tabu list that a \doxyref{mo\-TS}{p.}{classmo_t_s} uses. +Class describing a tabu list that a \doxyref{moTS}{p.}{classmo_t_s} uses. -It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{mo\-TS}{p.}{classmo_t_s}. +It is only a description, does nothing... A new object that herits from this class has to be defined in order to be used in a \doxyref{moTS}{p.}{classmo_t_s}. -Definition at line 22 of file mo\-Tabu\-List.h. +Definition at line 22 of file moTabuList.h. \subsection{Member Function Documentation} -\index{moTabuList@{mo\-Tabu\-List}!add@{add}} -\index{add@{add}!moTabuList@{mo\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Tabu\-List}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} +\index{moTabuList@{moTabuList}!add@{add}} +\index{add@{add}!moTabuList@{moTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::add (const M \& {\em \_\-\_\-move}, const {\bf EOT} \& {\em \_\-\_\-sol})\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_d279d72cb486d812da1ad3d24a69c286} Procedure to add a move in the tabu list. @@ -56,26 +56,26 @@ The two parameters have not to be modified so they are constant parameters. \end{Desc} -Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{mo\-Tabu\-List}!update@{update}} -\index{update@{update}!moTabuList@{mo\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Tabu\-List}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} +Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_43c979a9ec876c5e5b591b1c422395ef}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_fd6b3a1764121169650c969bba895615}.\index{moTabuList@{moTabuList}!update@{update}} +\index{update@{update}!moTabuList@{moTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::update ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_a2e5d1132f064093c8ed57046405f5ca} Procedure that updates the tabu list content. Generally, a counter associated to each saved move is decreased by one. -Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{mo\-Tabu\-List}!init@{init}} -\index{init@{init}!moTabuList@{mo\-Tabu\-List}} -\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf mo\-Tabu\-List}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} +Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_96cffc8118456ed762b07b9fc0e0679f}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_91b8b01dba7ffea8b63765d931e56f56}.\index{moTabuList@{moTabuList}!init@{init}} +\index{init@{init}!moTabuList@{moTabuList}} +\subsubsection{\setlength{\rightskip}{0pt plus 5cm}template$<$class M$>$ virtual void {\bf moTabuList}$<$ M $>$::init ()\hspace{0.3cm}{\tt [pure virtual]}}\label{classmo_tabu_list_0a06c459d56e8e2b408a8f3c6aec4e57} Procedure which initialises the tabu list. Can be useful if the data structure needs to be allocated before being used. -Implemented in {\bf mo\-Simple\-Move\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf mo\-Simple\-Solution\-Tabu\-List$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. +Implemented in {\bf moSimpleMoveTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_move_tabu_list_b91ae9971be30769757d1ad92c6009dc}, and {\bf moSimpleSolutionTabuList$<$ M $>$} \doxyref{}{p.}{classmo_simple_solution_tabu_list_d5645c39fec71a6110a2cbccbb08b816}. The documentation for this class was generated from the following file:\begin{CompactItemize} \item -mo\-Tabu\-List.h\end{CompactItemize} +moTabuList.h\end{CompactItemize} diff --git a/trunk/paradiseo-mo/docs/latex/doxygen.sty b/trunk/paradiseo-mo/docs/latex/doxygen.sty index 7b0895a58..cb32c81d4 100644 --- a/trunk/paradiseo-mo/docs/latex/doxygen.sty +++ b/trunk/paradiseo-mo/docs/latex/doxygen.sty @@ -10,8 +10,8 @@ {\fancyplain{}{\bfseries\rightmark}} \rhead[\fancyplain{}{\bfseries\leftmark}] {\fancyplain{}{\bfseries\thepage}} -\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by Doxygen }]{} -\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Mon Apr 23 09:22:27 2007 for PARADISEO-MO by Doxygen }} +\rfoot[\fancyplain{}{\bfseries\scriptsize Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by Doxygen }]{} +\lfoot[]{\fancyplain{}{\bfseries\scriptsize Generated on Mon Jun 25 17:41:41 2007 for PARADISEO-MO by Doxygen }} \cfoot{} \newenvironment{Code} {\footnotesize} diff --git a/trunk/paradiseo-mo/docs/latex/hierarchy.tex b/trunk/paradiseo-mo/docs/latex/hierarchy.tex index ae3028808..66deba8dc 100644 --- a/trunk/paradiseo-mo/docs/latex/hierarchy.tex +++ b/trunk/paradiseo-mo/docs/latex/hierarchy.tex @@ -1,79 +1,89 @@ \section{PARADISEO-MO Class Hierarchy} This inheritance list is sorted roughly, but not completely, alphabetically:\begin{CompactList} -\item \contentsline{section}{Empty\-Selection}{\pageref{class_empty_selection}}{} -\item eo\-Functor\-Base{\tt [external]}\begin{CompactList} -\item eo\-BF$<$ A1, A2, R $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} +\item \contentsline{section}{EmptySelection}{\pageref{class_empty_selection}}{} +\item eoFunctorBase{\tt [external]}\begin{CompactList} +\item eoBF$<$ const M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moTabuList$<$ M $>$}{\pageref{classmo_tabu_list}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Impr\-Best\-Fit\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} -\item \contentsline{section}{mo\-No\-Aspir\-Crit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} +\item \contentsline{section}{moSimpleMoveTabuList$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} +\item \contentsline{section}{moSimpleSolutionTabuList$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} \end{CompactList} -\item \contentsline{section}{mo\-LSCheck\-Point$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} -\item \contentsline{section}{mo\-Move\-Incr\-Eval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} -\item \contentsline{section}{mo\-Move\-Init$<$ M $>$}{\pageref{classmo_move_init}}{} -\item \contentsline{section}{mo\-Next\-Move$<$ M $>$}{\pageref{classmo_next_move}}{} +\end{CompactList} +\item eoBF$<$ const M \&, const M::EOType \&, M::EOType::Fitness $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moMoveIncrEval$<$ M $>$}{\pageref{classmo_move_incr_eval}}{} +\end{CompactList} +\item eoBF$<$ const M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moLSCheckPoint$<$ M $>$}{\pageref{classmo_l_s_check_point}}{} +\end{CompactList} +\item eoBF$<$ const M \&, const M::EOType::Fitness \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moAspirCrit$<$ M $>$}{\pageref{classmo_aspir_crit}}{} \begin{CompactList} -\item \contentsline{section}{mo\-It\-Rand\-Next\-Move$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} +\item \contentsline{section}{moImprBestFitAspirCrit$<$ M $>$}{\pageref{classmo_impr_best_fit_aspir_crit}}{} +\item \contentsline{section}{moNoAspirCrit$<$ M $>$}{\pageref{classmo_no_aspir_crit}}{} \end{CompactList} -\item \contentsline{section}{mo\-Tabu\-List$<$ M $>$}{\pageref{classmo_tabu_list}}{} +\end{CompactList} +\item eoBF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moMoveExpl$<$ M $>$}{\pageref{classmo_move_expl}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Simple\-Move\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_move_tabu_list}}{} -\item \contentsline{section}{mo\-Simple\-Solution\-Tabu\-List$<$ M $>$}{\pageref{classmo_simple_solution_tabu_list}}{} -\end{CompactList} -\end{CompactList} -\item eo\-BF$<$ const M::EOType \&, M::EOType \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Move\-Expl$<$ M $>$}{\pageref{classmo_move_expl}}{} +\item \contentsline{section}{moMoveLoopExpl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Move\-Loop\-Expl$<$ M $>$}{\pageref{classmo_move_loop_expl}}{} +\item \contentsline{section}{moHCMoveLoopExpl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} +\item \contentsline{section}{moTSMoveLoopExpl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} +\end{CompactList} +\end{CompactList} +\end{CompactList} +\item eoBF$<$ M \&, const M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moNextMove$<$ M $>$}{\pageref{classmo_next_move}}{} \begin{CompactList} -\item \contentsline{section}{mo\-HCMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_h_c_move_loop_expl}}{} -\item \contentsline{section}{mo\-TSMove\-Loop\-Expl$<$ M $>$}{\pageref{classmo_t_s_move_loop_expl}}{} +\item \contentsline{section}{moItRandNextMove$<$ M $>$}{\pageref{classmo_it_rand_next_move}}{} \end{CompactList} \end{CompactList} +\item eoBF$<$ M \&, const M::EOType \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moMoveInit$<$ M $>$}{\pageref{classmo_move_init}}{} \end{CompactList} -\item eo\-BF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Move\-Select$<$ M $>$}{\pageref{classmo_move_select}}{} +\item eoBF$<$ M \&, M::EOType::Fitness \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moMoveSelect$<$ M $>$}{\pageref{classmo_move_select}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Best\-Impr\-Select$<$ M $>$}{\pageref{classmo_best_impr_select}}{} -\item \contentsline{section}{mo\-First\-Impr\-Select$<$ M $>$}{\pageref{classmo_first_impr_select}}{} -\item \contentsline{section}{mo\-Rand\-Impr\-Select$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} +\item \contentsline{section}{moBestImprSelect$<$ M $>$}{\pageref{classmo_best_impr_select}}{} +\item \contentsline{section}{moFirstImprSelect$<$ M $>$}{\pageref{classmo_first_impr_select}}{} +\item \contentsline{section}{moRandImprSelect$<$ M $>$}{\pageref{classmo_rand_impr_select}}{} \end{CompactList} \end{CompactList} -\item eo\-UF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} +\item eoUF$<$ const EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moSolContinue$<$ EOT $>$}{\pageref{classmo_sol_continue}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Gen\-Sol\-Continue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} +\item \contentsline{section}{moGenSolContinue$<$ EOT $>$}{\pageref{classmo_gen_sol_continue}}{} \end{CompactList} \end{CompactList} -\item eo\-UF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Cooling\-Schedule}{\pageref{classmo_cooling_schedule}}{} +\item eoUF$<$ double \&, bool $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moCoolingSchedule}{\pageref{classmo_cooling_schedule}}{} \begin{CompactList} -\item \contentsline{section}{mo\-Exponential\-Cooling\-Schedule}{\pageref{classmo_exponential_cooling_schedule}}{} -\item \contentsline{section}{mo\-Linear\-Cooling\-Schedule}{\pageref{classmo_linear_cooling_schedule}}{} +\item \contentsline{section}{moExponentialCoolingSchedule}{\pageref{classmo_exponential_cooling_schedule}}{} +\item \contentsline{section}{moLinearCoolingSchedule}{\pageref{classmo_linear_cooling_schedule}}{} \end{CompactList} \end{CompactList} -\item eo\-UF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Algo$<$ EOT $>$}{\pageref{classmo_algo}}{} +\item eoUF$<$ EOT \&, bool $>${\tt [external]}\begin{CompactList} +\item eoMonOp$<$ EOT $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moAlgo$<$ EOT $>$}{\pageref{classmo_algo}}{} \end{CompactList} \end{CompactList} -\item eo\-UF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Move$<$ EOT $>$}{\pageref{classmo_move}}{} +\item eoUF$<$ EOT \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moMove$<$ EOT $>$}{\pageref{classmo_move}}{} \end{CompactList} -\item eo\-UF$<$ EOType \&, bool $>${\tt [external]}\item eo\-UF$<$ M \&, void $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Rand\-Move$<$ M $>$}{\pageref{classmo_rand_move}}{} +\item eoUF$<$ EOType \&, bool $>${\tt [external]}\item eoUF$<$ M \&, void $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moRandMove$<$ M $>$}{\pageref{classmo_rand_move}}{} \end{CompactList} -\item eo\-UF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\begin{CompactList} -\item \contentsline{section}{mo\-Algo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} +\item eoUF$<$ M::EOType \&, bool $>${\tt [external]}\begin{CompactList} +\item eoMonOp$<$ M::EOType $>${\tt [external]}\begin{CompactList} +\item \contentsline{section}{moAlgo$<$ M::EOType $>$}{\pageref{classmo_algo}}{} \begin{CompactList} -\item \contentsline{section}{mo\-HC$<$ M $>$}{\pageref{classmo_h_c}}{} -\item \contentsline{section}{mo\-SA$<$ M $>$}{\pageref{classmo_s_a}}{} -\item \contentsline{section}{mo\-TS$<$ M $>$}{\pageref{classmo_t_s}}{} +\item \contentsline{section}{moHC$<$ M $>$}{\pageref{classmo_h_c}}{} +\item \contentsline{section}{moSA$<$ M $>$}{\pageref{classmo_s_a}}{} +\item \contentsline{section}{moTS$<$ M $>$}{\pageref{classmo_t_s}}{} \end{CompactList} \end{CompactList} \end{CompactList} \end{CompactList} -\item eo\-Op$<$ EOType $>${\tt [external]}\begin{CompactList} -\item eo\-Mon\-Op$<$ EOT $>${\tt [external]}\item eo\-Mon\-Op$<$ M::EOType $>${\tt [external]}\end{CompactList} +\item eoOp$<$ EOType $>${\tt [external]}\begin{CompactList} +\item eoMonOp$<$ EOT $>${\tt [external]}\item eoMonOp$<$ M::EOType $>${\tt [external]}\end{CompactList} \end{CompactList} diff --git a/trunk/paradiseo-mo/docs/latex/refman.tex b/trunk/paradiseo-mo/docs/latex/refman.tex index 914e80460..19edf2214 100644 --- a/trunk/paradiseo-mo/docs/latex/refman.tex +++ b/trunk/paradiseo-mo/docs/latex/refman.tex @@ -7,6 +7,7 @@ \usepackage{float} \usepackage{textcomp} \usepackage{alltt} +\usepackage[utf8]{inputenc} \usepackage{doxygen} \makeindex \setcounter{tocdepth}{1} @@ -17,9 +18,9 @@ \begin{center} {\Large PARADISEO-MO Reference Manual\\[1ex]\large 0.1 }\\ \vspace*{1cm} -{\large Generated by Doxygen 1.5.1}\\ +{\large Generated by Doxygen 1.5.2}\\ \vspace*{0.5cm} -{\small Mon Apr 23 09:22:27 2007}\\ +{\small Mon Jun 25 17:41:41 2007}\\ \end{center} \end{titlepage} \clearemptydoublepage diff --git a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 index a6b87faa3..3f629a6ef 100644 --- a/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 +++ b/trunk/paradiseo-mo/docs/man/man3/EmptySelection.3 @@ -1,4 +1,4 @@ -.TH "EmptySelection" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "EmptySelection" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 index c9ed2b196..b139b4fbb 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAlgo.3 @@ -1,4 +1,4 @@ -.TH "moAlgo" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAlgo" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 index 43b52c2bf..5fd3c794e 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moAspirCrit" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moAspirCrit" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moAspirCrit \- Description of the conditions in which a tabu move could be accep .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType::Fitness &, bool >\fP. +Inherits \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. .PP Inherited by \fBmoImprBestFitAspirCrit< M >\fP, and \fBmoNoAspirCrit< M >\fP. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 index 1e689265e..2cb03f9de 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moBestImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moBestImprSelect" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moBestImprSelect" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 index 8c9865366..f7372a536 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moCoolingSchedule" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moCoolingSchedule" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 index f0de0e422..b795a1b53 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moExponentialCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moExponentialCoolingSchedule" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moExponentialCoolingSchedule" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 index 154554e3d..1466a27e0 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moFirstImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moFirstImprSelect" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moFirstImprSelect" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 index 8c779947f..1fd91bc01 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moGenSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moGenSolContinue" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moGenSolContinue" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "\fBmoGenSolContinue\fP (unsigned __maxNumGen)" +.RI "\fBmoGenSolContinue\fP (unsigned int __maxNumGen)" .br .RI "\fISimple constructor. \fP" .ti -1c @@ -32,11 +32,11 @@ Inherits \fBmoSolContinue< EOT >< EOT >\fP. .in +1c .ti -1c -.RI "unsigned \fBmaxNumGen\fP" +.RI "unsigned int \fBmaxNumGen\fP" .br .RI "\fIIteration maximum number. \fP" .ti -1c -.RI "unsigned \fBnumGen\fP" +.RI "unsigned int \fBnumGen\fP" .br .RI "\fIIteration current number. \fP" .in -1c @@ -51,7 +51,7 @@ The stop criterion corresponds to a maximum number of iteration. Definition at line 21 of file moGenSolContinue.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoGenSolContinue\fP< EOT >::\fBmoGenSolContinue\fP (unsigned __maxNumGen)\fC [inline]\fP" +.SS "template \fBmoGenSolContinue\fP< EOT >::\fBmoGenSolContinue\fP (unsigned int __maxNumGen)\fC [inline]\fP" .PP Simple constructor. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moHC.3 b/trunk/paradiseo-mo/docs/man/man3/moHC.3 index d8b1f40b1..c114f4b2c 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHC.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHC.3 @@ -1,4 +1,4 @@ -.TH "moHC" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHC" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 index 3cf190c92..f03dd3b46 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moHCMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moHCMoveLoopExpl" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moHCMoveLoopExpl" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 index 7006590e5..9fa302687 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moImprBestFitAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moImprBestFitAspirCrit" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moImprBestFitAspirCrit" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -59,7 +59,7 @@ This criterion is satisfied when a given fitness is the best ever considered. Definition at line 22 of file moImprBestFitAspirCrit.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline]\fP" +.SS "template bool \fBmoImprBestFitAspirCrit\fP< M >::operator() (const M & __move, const \fBFitness\fP & __fit)\fC [inline, virtual]\fP" .PP Function that indicates if the fit is better that the already saved fit. .PP @@ -78,6 +78,8 @@ TRUE the first time and if __fit > best_fit, else FALSE. .RE .PP +.PP +Implements \fBeoBF< const M &, const M::EOType::Fitness &, bool >\fP. .PP Definition at line 52 of file moImprBestFitAspirCrit.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 index a5f2efc37..ba4e4f84e 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moItRandNextMove.3 @@ -1,4 +1,4 @@ -.TH "moItRandNextMove" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moItRandNextMove" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -16,7 +16,7 @@ Inherits \fBmoNextMove< M >< M >\fP. .in +1c .ti -1c -.RI "\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > &__rand_move, unsigned __max_iter)" +.RI "\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > &__rand_move, unsigned int __max_iter)" .br .RI "\fIThe constructor. \fP" .ti -1c @@ -40,11 +40,11 @@ Inherits \fBmoNextMove< M >< M >\fP. .br .RI "\fIA move generator (generally randomly). \fP" .ti -1c -.RI "unsigned \fBmax_iter\fP" +.RI "unsigned int \fBmax_iter\fP" .br .RI "\fIIteration maximum number. \fP" .ti -1c -.RI "unsigned \fBnum_iter\fP" +.RI "unsigned int \fBnum_iter\fP" .br .RI "\fIIteration current number. \fP" .in -1c @@ -59,7 +59,7 @@ This class is a move (\fBmoMove\fP) generator with a bound for the maximum numbe Definition at line 22 of file moItRandNextMove.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoItRandNextMove\fP< M >::\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > & __rand_move, unsigned __max_iter)\fC [inline]\fP" +.SS "template \fBmoItRandNextMove\fP< M >::\fBmoItRandNextMove\fP (\fBmoRandMove\fP< M > & __rand_move, unsigned int __max_iter)\fC [inline]\fP" .PP The constructor. .PP @@ -77,7 +77,7 @@ The constructor. Definition at line 37 of file moItRandNextMove.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoItRandNextMove\fP< M >::operator() (M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP Generation of a new move. .PP @@ -96,6 +96,8 @@ FALSE if the maximum number of iteration is reached, else TRUE. .RE .PP +.PP +Implements \fBeoBF< M &, const M::EOType &, bool >\fP. .PP Definition at line 52 of file moItRandNextMove.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 index 3b43da9d1..99110bbc8 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLSCheckPoint.3 @@ -1,4 +1,4 @@ -.TH "moLSCheckPoint" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLSCheckPoint" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moLSCheckPoint \- Class which allows a checkpointing system. .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, void >\fP. +Inherits \fBeoBF< const M &, const M::EOType &, void >\fP. .PP .SS "Public Member Functions" diff --git a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 index 4368d0436..146f682b6 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moLinearCoolingSchedule.3 @@ -1,4 +1,4 @@ -.TH "moLinearCoolingSchedule" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moLinearCoolingSchedule" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMove.3 b/trunk/paradiseo-mo/docs/man/man3/moMove.3 index 9869f3321..f3fcb72ef 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMove.3 @@ -1,4 +1,4 @@ -.TH "moMove" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMove" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 index 153c3e48f..83d46f9e5 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveExpl" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveExpl" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 index a406731dd..7e03d623a 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveIncrEval.3 @@ -1,4 +1,4 @@ -.TH "moMoveIncrEval" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveIncrEval" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveIncrEval \- (generally) Efficient evaluation function based a move and a s .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, M::EOType::Fitness >\fP. +Inherits \fBeoBF< const M &, const M::EOType &, M::EOType::Fitness >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 index f8fc2376b..ab56505af 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveInit.3 @@ -1,4 +1,4 @@ -.TH "moMoveInit" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveInit" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moMoveInit \- Move (\fBmoMove\fP) initializer. .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, void >\fP. +Inherits \fBeoBF< M &, const M::EOType &, void >\fP. .PP .SH "Detailed Description" .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 index b398d1232..d20cc9b03 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moMoveLoopExpl" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveLoopExpl" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 index fc9870bd8..cb9829820 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moMoveSelect.3 @@ -1,4 +1,4 @@ -.TH "moMoveSelect" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moMoveSelect" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 index 6dd135af4..f4f0d4f8f 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNextMove.3 @@ -1,4 +1,4 @@ -.TH "moNextMove" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNextMove" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moNextMove \- Class which allows to generate a new move (\fBmoMove\fP). .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const M &, M::EOType &, bool >\fP. +Inherits \fBeoBF< M &, const M::EOType &, bool >\fP. .PP Inherited by \fBmoItRandNextMove< M >\fP. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 index f80047c70..209a11953 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moNoAspirCrit.3 @@ -1,4 +1,4 @@ -.TH "moNoAspirCrit" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moNoAspirCrit" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 index bfb1fdfc9..b3fd283cc 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandImprSelect.3 @@ -1,4 +1,4 @@ -.TH "moRandImprSelect" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandImprSelect" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 index 1a9078507..678bd9388 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moRandMove.3 @@ -1,4 +1,4 @@ -.TH "moRandMove" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moRandMove" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moSA.3 b/trunk/paradiseo-mo/docs/man/man3/moSA.3 index 60e5f0284..28b43708f 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSA.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSA.3 @@ -1,4 +1,4 @@ -.TH "moSA" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSA" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 index 7c53a1e97..cf1fb7ac5 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleMoveTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleMoveTabuList" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleMoveTabuList" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,7 +24,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .in +1c .ti -1c -.RI "\fBmoSimpleMoveTabuList\fP (unsigned __size)" +.RI "\fBmoSimpleMoveTabuList\fP (unsigned int __size)" .br .RI "\fIConstructor. \fP" .ti -1c @@ -56,11 +56,11 @@ Inherits \fBmoTabuList< M >< M >\fP. .in +1c .ti -1c -.RI "unsigned \fBmaxSize\fP" +.RI "unsigned int \fBmaxSize\fP" .br .RI "\fIThe maximum size of the tabu list. \fP" .ti -1c -.RI "unsigned \fBcurrentSize\fP" +.RI "unsigned int \fBcurrentSize\fP" .br .RI "\fIThe current size of the tabu list. \fP" .ti -1c @@ -77,7 +77,7 @@ Class describing a move tabu list with a limited memory. Definition at line 22 of file moSimpleMoveTabuList.h. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoSimpleMoveTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP Function that indicates if, in a given state, the _move is tabu or not. .PP @@ -94,6 +94,8 @@ true or false. .RE .PP +.PP +Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 46 of file moSimpleMoveTabuList.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 index c2338477c..2d66312d1 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSimpleSolutionTabuList.3 @@ -1,4 +1,4 @@ -.TH "moSimpleSolutionTabuList" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSimpleSolutionTabuList" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -24,7 +24,7 @@ Inherits \fBmoTabuList< M >< M >\fP. .in +1c .ti -1c -.RI "\fBmoSimpleSolutionTabuList\fP (unsigned __size)" +.RI "\fBmoSimpleSolutionTabuList\fP (unsigned int __size)" .br .RI "\fIConstructor. \fP" .ti -1c @@ -56,11 +56,11 @@ Inherits \fBmoTabuList< M >< M >\fP. .in +1c .ti -1c -.RI "unsigned \fBmaxSize\fP" +.RI "unsigned int \fBmaxSize\fP" .br .RI "\fIThe maximum size of the tabu list. \fP" .ti -1c -.RI "unsigned \fBcurrentSize\fP" +.RI "unsigned int \fBcurrentSize\fP" .br .RI "\fIThe current size of the tabu list. \fP" .ti -1c @@ -77,7 +77,7 @@ Class describing a solution tabu list with limited length. Definition at line 22 of file moSimpleSolutionTabuList.h. .SH "Constructor & Destructor Documentation" .PP -.SS "template \fBmoSimpleSolutionTabuList\fP< M >::\fBmoSimpleSolutionTabuList\fP (unsigned __size)\fC [inline]\fP" +.SS "template \fBmoSimpleSolutionTabuList\fP< M >::\fBmoSimpleSolutionTabuList\fP (unsigned int __size)\fC [inline]\fP" .PP Constructor. .PP @@ -93,7 +93,7 @@ Definition at line 34 of file moSimpleSolutionTabuList.h. References moSimpleSolutionTabuList< M >::currentSize. .SH "Member Function Documentation" .PP -.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline]\fP" +.SS "template bool \fBmoSimpleSolutionTabuList\fP< M >::operator() (const M & __move, const \fBEOT\fP & __sol)\fC [inline, virtual]\fP" .PP Function that indicates if, in a given state, the _move is tabu or not. .PP @@ -110,6 +110,8 @@ true or false. .RE .PP +.PP +Implements \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Definition at line 45 of file moSimpleSolutionTabuList.h. .PP diff --git a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 index b559f7722..7ce35eaae 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moSolContinue.3 @@ -1,4 +1,4 @@ -.TH "moSolContinue" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moSolContinue" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moTS.3 b/trunk/paradiseo-mo/docs/man/man3/moTS.3 index 55e8234d9..9eb7595ec 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTS.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTS.3 @@ -1,4 +1,4 @@ -.TH "moTS" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTS" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -60,7 +60,7 @@ Inherits \fBmoAlgo< M::EOType >\fP. .in +1c .ti -1c -.RI "static bool \fBfirst_time\fP" +.RI "static bool \fBfirst_time\fP = true" .br .RI "\fIBoolean allowing to initialise the ptread_mutex_t in the constructor. \fP" .ti -1c diff --git a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 index a09aac1ef..229c78520 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTSMoveLoopExpl.3 @@ -1,4 +1,4 @@ -.TH "moTSMoveLoopExpl" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTSMoveLoopExpl" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME diff --git a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 index a714fa405..7740daa79 100644 --- a/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 +++ b/trunk/paradiseo-mo/docs/man/man3/moTabuList.3 @@ -1,4 +1,4 @@ -.TH "moTabuList" 3 "23 Apr 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- +.TH "moTabuList" 3 "25 Jun 2007" "Version 0.1" "PARADISEO-MO" \" -*- nroff -*- .ad l .nh .SH NAME @@ -10,7 +10,7 @@ moTabuList \- Class describing a tabu list that a \fBmoTS\fP uses. .PP \fC#include \fP .PP -Inherits \fBeoBF< A1, A2, R >< const const M &, M::EOType &, bool >\fP. +Inherits \fBeoBF< const M &, const M::EOType &, bool >\fP. .PP Inherited by \fBmoSimpleMoveTabuList< M >\fP, and \fBmoSimpleSolutionTabuList< M >\fP. .PP diff --git a/trunk/paradiseo-mo/docs/mo.doxytag b/trunk/paradiseo-mo/docs/mo.doxytag index fc6510293..8769bf31d 100644 --- a/trunk/paradiseo-mo/docs/mo.doxytag +++ b/trunk/paradiseo-mo/docs/mo.doxytag @@ -23,7 +23,7 @@ moAspirCrit classmo_aspir_crit.html M - eoBF + eoBF< const M &, const M::EOType::Fitness &, bool > virtual void init @@ -196,8 +196,8 @@ moGenSolContinue classmo_gen_sol_continue.html - 6b6cab23a23bd8904ea52ef5141d8d0a - (unsigned __maxNumGen) + b56e890f1caa3f98e161c6512b59c95b + (unsigned int __maxNumGen) bool @@ -214,17 +214,17 @@ () - unsigned + unsigned int maxNumGen classmo_gen_sol_continue.html - 6d7674fc51d17423e8ee28693a08b5af + 30b9861e090578bdfa2374806600987a - unsigned + unsigned int numGen classmo_gen_sol_continue.html - a18ebfd270f96517b4edaa2cad3eb9e0 + 630d9736a3a2c952540cdc211764258c @@ -402,8 +402,8 @@ moItRandNextMove classmo_it_rand_next_move.html - 95ed13e1178f4e44cab7184b040b83d7 - (moRandMove< M > &__rand_move, unsigned __max_iter) + 2b61b3713d482ecf71db8d941551ff7a + (moRandMove< M > &__rand_move, unsigned int __max_iter) bool @@ -427,17 +427,17 @@ - unsigned + unsigned int max_iter classmo_it_rand_next_move.html - 3c476f7cc089b171493c52965f920542 + dc67fa86677d7a4f982de8d8b1eba033 - unsigned + unsigned int num_iter classmo_it_rand_next_move.html - c3551d7910cf351d63f0f3427fc18504 + f43494b13931d8f76b5d9d5d6469e91b @@ -478,7 +478,7 @@ moLSCheckPoint classmo_l_s_check_point.html M - eoBF + eoBF< const M &, const M::EOType &, void > void operator() @@ -524,13 +524,13 @@ moMoveIncrEval classmo_move_incr_eval.html M - eoBF + eoBF< const M &, const M::EOType &, M::EOType::Fitness > moMoveInit classmo_move_init.html M - eoBF + eoBF< M &, const M::EOType &, void > moMoveLoopExpl @@ -569,7 +569,7 @@ moNextMove classmo_next_move.html M - eoBF + eoBF< M &, const M::EOType &, bool > moNoAspirCrit @@ -744,8 +744,8 @@ moSimpleMoveTabuList classmo_simple_move_tabu_list.html - d29bb1cfc8d1fd2de1cccf821d066b66 - (unsigned __size) + 12798ce0bc3a2ee031fb301290ed6d79 + (unsigned int __size) bool @@ -783,17 +783,17 @@ (const M &__move) - unsigned + unsigned int maxSize classmo_simple_move_tabu_list.html - 9f4860b378366e774c61a0d2034811e1 + e48848e9e5c9c8435475cbdf21658e23 - unsigned + unsigned int currentSize classmo_simple_move_tabu_list.html - bd417b084e01343cba914a8193dab3a1 + f1f9524e62d48f3688aa58a6055ccceb @@ -820,8 +820,8 @@ moSimpleSolutionTabuList classmo_simple_solution_tabu_list.html - 24576bd9a907b8925c7d7d5ce6fde445 - (unsigned __size) + 8f8ce82b49ff49efbd934cedd3e34178 + (unsigned int __size) bool @@ -859,17 +859,17 @@ (const EOT &__sol) - unsigned + unsigned int maxSize classmo_simple_solution_tabu_list.html - d059072e23ba086ede801abdd32f7218 + 662e1f65fadff234692be009a2440845 - unsigned + unsigned int currentSize classmo_simple_solution_tabu_list.html - ddc7196b9adcba0081810619a978490c + 2aaf6e882d10495adddae94cb7a48fbf @@ -897,7 +897,7 @@ moTabuList classmo_tabu_list.html M - eoBF + eoBF< const M &, const M::EOType &, bool > M::EOType EOT diff --git a/trunk/paradiseo-mo/src/moGenSolContinue.h b/trunk/paradiseo-mo/src/moGenSolContinue.h index 79921a627..2bd8ba4e5 100755 --- a/trunk/paradiseo-mo/src/moGenSolContinue.h +++ b/trunk/paradiseo-mo/src/moGenSolContinue.h @@ -27,7 +27,7 @@ public: /*! \param __maxNumGen the maximum number of generation. */ - moGenSolContinue (unsigned __maxNumGen):maxNumGen (__maxNumGen), numGen (0) + moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0) { } @@ -60,10 +60,10 @@ public: private: //! Iteration maximum number. - unsigned maxNumGen; + unsigned int maxNumGen; //! Iteration current number. - unsigned numGen; + unsigned int numGen; }; #endif diff --git a/trunk/paradiseo-mo/src/moItRandNextMove.h b/trunk/paradiseo-mo/src/moItRandNextMove.h index 5f24bed39..ceacc061a 100755 --- a/trunk/paradiseo-mo/src/moItRandNextMove.h +++ b/trunk/paradiseo-mo/src/moItRandNextMove.h @@ -35,7 +35,7 @@ public: \param __max_iter the iteration maximum number. */ moItRandNextMove (moRandMove < M > &__rand_move, - unsigned __max_iter):rand_move (__rand_move), + unsigned int __max_iter):rand_move (__rand_move), max_iter (__max_iter), num_iter (0) { @@ -74,10 +74,10 @@ private: moRandMove < M > &rand_move; //! Iteration maximum number. - unsigned max_iter; + unsigned int max_iter; //! Iteration current number. - unsigned num_iter; + unsigned int num_iter; }; diff --git a/trunk/paradiseo-mo/src/moLSCheckPoint.h b/trunk/paradiseo-mo/src/moLSCheckPoint.h index 78a8e3e52..097208a83 100755 --- a/trunk/paradiseo-mo/src/moLSCheckPoint.h +++ b/trunk/paradiseo-mo/src/moLSCheckPoint.h @@ -34,7 +34,7 @@ public: operator () (const M & __move, const typename M::EOType & __sol) { - for (unsigned i = 0; i < func.size (); i++) + for (unsigned int i = 0; i < func.size (); i++) { func[i]->operator ()(__move, __sol); } diff --git a/trunk/paradiseo-mo/src/moSA.h b/trunk/paradiseo-mo/src/moSA.h index aabd5805f..bbe63dc48 100755 --- a/trunk/paradiseo-mo/src/moSA.h +++ b/trunk/paradiseo-mo/src/moSA.h @@ -87,8 +87,7 @@ public: full_eval (__sol); } - double - temp = init_temp; + double temp = init_temp; M move; @@ -140,8 +139,7 @@ private: moSolContinue < EOT > &cont; //! Initial temperature - double - init_temp; + double init_temp; //! The cooling schedule moCoolingSchedule & cool_sched; diff --git a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h index ab4fae339..efa97fe5d 100755 --- a/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleMoveTabuList.h @@ -31,7 +31,7 @@ public: /* \param __size The maximum size of the move tabu list. */ - moSimpleMoveTabuList(unsigned __size): maxSize(__size) + moSimpleMoveTabuList(unsigned int __size): maxSize(__size) { currentSize=0; } @@ -114,10 +114,10 @@ private: } //! The maximum size of the tabu list. - unsigned maxSize; + unsigned int maxSize; //! The current size of the tabu list. - unsigned currentSize; + unsigned int currentSize; //! The move tabu list. std::list tabuList; diff --git a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h index 09d6fdb5b..82d00b2fa 100755 --- a/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h +++ b/trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h @@ -31,7 +31,7 @@ public: /*! \param __size The maximum size of the solution tabu list. */ - moSimpleSolutionTabuList(unsigned __size): maxSize(__size) + moSimpleSolutionTabuList(unsigned int __size): maxSize(__size) { currentSize=0; } @@ -123,10 +123,10 @@ private: } //! The maximum size of the tabu list. - unsigned maxSize; + unsigned int maxSize; //! The current size of the tabu list. - unsigned currentSize; + unsigned int currentSize; //! The solution tabu list. std::list tabuList; diff --git a/trunk/paradiseo-mo/src/moTS.h b/trunk/paradiseo-mo/src/moTS.h index aae975b31..156dc70f1 100755 --- a/trunk/paradiseo-mo/src/moTS.h +++ b/trunk/paradiseo-mo/src/moTS.h @@ -156,14 +156,10 @@ moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc < private: //! Boolean allowing to initialise the ptread_mutex_t in the constructor - static - bool - first_time; + static bool first_time; //! The lock - static - pthread_mutex_t - mutex; + static pthread_mutex_t mutex; //! Neighborhood explorer moMoveExpl < M > &move_expl; diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing index 1ea4a7a88..026d79dd5 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing and b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp index ad4d10cdd..8f1b8ab46 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp @@ -9,10 +9,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#include -#include -#include -#include +#include #include #include diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search index a4befc0bc..03b8e6cca 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search and b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp index 043d35875..59a5d9712 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson2/tabu_search.cpp @@ -9,15 +9,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include #include diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing index b7b3348a5..bb630f121 100755 Binary files a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing and b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing differ diff --git a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp index 144f714c5..d0707dd88 100644 --- a/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp +++ b/trunk/paradiseo-mo/tutorial/Lesson3/simulated_annealing.cpp @@ -9,10 +9,7 @@ Contact: paradiseo-help@lists.gforge.inria.fr */ -#include -#include -#include -#include +#include #include #include diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp index 5107ba098..c8984e204 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.cpp @@ -18,95 +18,111 @@ #define MAXINT 1000000 -void EdgeXover :: build_map (const Route & __par1, const Route & __par2) { +void +EdgeXover :: build_map (const Route & __par1, const Route & __par2) +{ - unsigned len = __par1.size () ; + unsigned int len = __par1.size () ; /* Initialization */ _map.clear () ; _map.resize (len) ; - for (unsigned i = 0 ; i < len ; i ++) { - _map [__par1 [i]].insert (__par1 [(i + 1) % len]) ; - _map [__par2 [i]].insert (__par2 [(i + 1) % len]) ; - _map [__par1 [i]].insert (__par1 [(i - 1 + len) % len]) ; - _map [__par2 [i]].insert (__par2 [(i - 1 + len) % len]) ; - } + for (unsigned int i = 0 ; i < len ; i ++) + { + _map [__par1 [i]].insert (__par1 [(i + 1) % len]) ; + _map [__par2 [i]].insert (__par2 [(i + 1) % len]) ; + _map [__par1 [i]].insert (__par1 [(i - 1 + len) % len]) ; + _map [__par2 [i]].insert (__par2 [(i - 1 + len) % len]) ; + } visited.clear () ; visited.resize (len, false) ; } -void EdgeXover :: remove_entry (unsigned __vertex, std :: vector > & __map) { +void +EdgeXover :: remove_entry (unsigned int __vertex, std :: vector > & __map) +{ - std :: set & neigh = __map [__vertex] ; + std :: set & neigh = __map [__vertex] ; - for (std :: set :: iterator it = neigh.begin () ; - it != neigh.end () ; - it ++) - __map [* it].erase (__vertex) ; + for (std :: set :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) + { + __map [* it].erase (__vertex) ; + } } -void EdgeXover :: add_vertex (unsigned __vertex, Route & __child) { - +void +EdgeXover :: add_vertex (unsigned int __vertex, Route & __child) +{ visited [__vertex] = true ; __child.push_back (__vertex) ; remove_entry (__vertex, _map) ; /* Removing entries */ } -void EdgeXover :: cross (const Route & __par1, const Route & __par2, Route & __child) { +void +EdgeXover :: cross (const Route & __par1, const Route & __par2, Route & __child) { build_map (__par1, __par2) ; - unsigned len = __par1.size () ; + unsigned int len = __par1.size () ; /* Go ! */ __child.clear () ; - unsigned cur_vertex = rng.random (len) ; + unsigned int cur_vertex = rng.random (len) ; add_vertex (cur_vertex, __child) ; - for (unsigned i = 1 ; i < len ; i ++) { + for (unsigned int i = 1 ; i < len ; i ++) { - unsigned len_min_entry = MAXINT ; + unsigned int len_min_entry = MAXINT ; - std :: set & neigh = _map [cur_vertex] ; + std :: set & neigh = _map [cur_vertex] ; - for (std :: set :: iterator it = neigh.begin () ; - it != neigh.end () ; - it ++) { - unsigned l = _map [* it].size () ; - if (len_min_entry > l) - len_min_entry = l ; - } + for (std :: set :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) + { + unsigned int l = _map [* it].size () ; + if (len_min_entry > l) + { + len_min_entry = l ; + } + } - std :: vector cand ; /* Candidates */ + std :: vector cand ; /* Candidates */ - for (std :: set :: iterator it = neigh.begin () ; - it != neigh.end () ; - it ++) { - unsigned l = _map [* it].size () ; - if (len_min_entry == l) - cand.push_back (* it) ; - } + for (std :: set :: iterator it = neigh.begin () ; it != neigh.end () ; it ++) + { + unsigned int l = _map [* it].size () ; + if (len_min_entry == l) + { + cand.push_back (* it) ; + } + } - if (! cand.size ()) { - - /* Oh no ! Implicit mutation */ - for (unsigned j = 0 ; j < len ; j ++) - if (! visited [j]) - cand.push_back (j) ; - } - + if (! cand.size ()) + { + + /* Oh no ! Implicit mutation */ + for (unsigned int j = 0 ; j < len ; j ++) + { + if (! visited [j]) + { + cand.push_back (j) ; + } + } + } + cur_vertex = cand [rng.random (cand.size ())] ; add_vertex (cur_vertex, __child) ; } } -bool EdgeXover :: operator () (Route & __route1, Route & __route2) { +bool +EdgeXover :: operator () (Route & __route1, Route & __route2) +{ // Init. copy Route par [2] ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h index 0fd20544b..3c22e2f8f 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/edge_xover.h @@ -20,7 +20,8 @@ #include "route.h" /** Edge Crossover */ -class EdgeXover : public eoQuadOp { +class EdgeXover : public eoQuadOp +{ public : @@ -30,14 +31,14 @@ private : void cross (const Route & __par1, const Route & __par2, Route & __child) ; /* Binary */ - void remove_entry (unsigned __vertex, std :: vector > & __map) ; + void remove_entry (unsigned int __vertex, std :: vector > & __map) ; /* Updating the map of entries */ void build_map (const Route & __par1, const Route & __par2) ; - void add_vertex (unsigned __vertex, Route & __child) ; + void add_vertex (unsigned int __vertex, Route & __child) ; - std :: vector > _map ; /* The handled map */ + std :: vector > _map ; /* The handled map */ std :: vector visited ; /* Vertices that are already visited */ diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp index e73a8d670..0a0e07fcd 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.cpp @@ -19,61 +19,71 @@ namespace Graph { static std :: vector > vectCoord ; // Coordinates - static std :: vector > dist ; // Distances Mat. + static std :: vector > dist ; // Distances Mat. - unsigned size () { - + unsigned size () + { return dist.size () ; } - void computeDistances () { - + void computeDistances () + { + // Dim. - unsigned numCities = vectCoord.size () ; + unsigned int numCities = vectCoord.size () ; dist.resize (numCities) ; - for (unsigned i = 0 ; i < dist.size () ; i ++) - dist [i].resize (numCities) ; + for (unsigned int i = 0 ; i < dist.size () ; i ++) + { + dist [i].resize (numCities) ; + } // Computations. - for (unsigned i = 0 ; i < dist.size () ; i ++) - for (unsigned j = i + 1 ; j < dist.size () ; j ++) { - double distX = vectCoord [i].first - vectCoord [j].first ; - double distY = vectCoord [i].second - vectCoord [j].second ; - dist [i] [j] = dist [j] [i] = (unsigned) (sqrt ((float) (distX * distX + distY * distY)) + 0.5) ; + for (unsigned int i = 0 ; i < dist.size () ; i ++) + { + for (unsigned int j = i + 1 ; j < dist.size () ; j ++) + { + double distX = (double)(vectCoord [i].first - vectCoord [j].first) ; + double distY = (double)(vectCoord [i].second - vectCoord [j].second) ; + dist [i] [j] = dist [j] [i] = (unsigned) (sqrt ((float) (distX * distX + distY * distY)) + 0.5) ; + } } } - void load (const char * __fileName) { - + void load (const char * __fileName) + { + std :: ifstream f (__fileName) ; - + std :: cout << ">> Loading [" << __fileName << "]" << std :: endl ; - if (f) { - - unsigned num_vert ; - - f >> num_vert ; - vectCoord.resize (num_vert) ; - - for (unsigned i = 0 ; i < num_vert ; i ++) - f >> vectCoord [i].first >> vectCoord [i].second ; + if (f) + { + unsigned int num_vert ; + + f >> num_vert ; + vectCoord.resize (num_vert) ; + + for (unsigned int i = 0 ; i < num_vert ; i ++) + { + f >> vectCoord [i].first >> vectCoord [i].second ; + } - f.close () ; - - computeDistances () ; - } - else { - - std :: cout << __fileName << " doesn't exist !!!" << std :: endl ; - // Bye !!! - exit (1) ; - } + f.close () ; + + computeDistances () ; + } + else + { + + std :: cout << __fileName << " doesn't exist !!!" << std :: endl ; + // Bye !!! + exit (1) ; + } } - - float distance (unsigned __from, unsigned __to) { - - return dist [__from] [__to] ; + + float distance (unsigned int __from, unsigned int __to) + { + return (float)(dist [__from] [__to]) ; } } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h index b6a4adc21..19baf8ac4 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/graph.h @@ -15,16 +15,16 @@ #include #include -namespace Graph { - +namespace Graph +{ void load (const char * __file_name) ; /* Loading cities (expressed by their coordinates) from the given file name */ - float distance (unsigned __from, unsigned __to) ; + float distance (unsigned int __from, unsigned int __to) ; - unsigned size () ; // How many cities ? + unsigned int size () ; // How many cities ? } #endif diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a index 0e04bc655..75ad5513a 100644 Binary files a/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a and b/trunk/paradiseo-mo/tutorial/examples/tsp/src/libtsp.a differ diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h index 979f0b079..390168d54 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/mix.h @@ -14,10 +14,12 @@ #include -template void mix (std :: vector & __vect) { - - for (unsigned i = 0 ; i < __vect.size () ; i ++) - std :: swap (__vect [i], __vect [rng.random (__vect.size ())]) ; +template void mix (std :: vector & __vect) +{ + for (unsigned int i = 0 ; i < __vect.size () ; i ++) + { + std :: swap (__vect [i], __vect [rng.random (__vect.size ())]) ; + } } #endif diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp index c845e0b5c..54de70705 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.cpp @@ -10,43 +10,46 @@ */ #include -#include +#include #include #include "order_xover.h" #include "route_valid.h" -void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) { +void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) +{ - unsigned cut = rng.random (__par1.size ()) ; + unsigned int cut = rng.random (__par1.size ()) ; /* To store vertices that have already been crossed */ - vector v; + std::vector v; v.resize(__par1.size()); - for (unsigned i = 0 ; i < __par1.size () ; i ++) + for (unsigned int i = 0 ; i < __par1.size () ; i ++) { v [i] = false ; } /* Copy of the left partial route of the first parent */ - for (unsigned i = 0 ; i < cut ; i ++) { - __child [i] = __par1 [i] ; - v [__par1 [i]] = true ; - } + for (unsigned int i = 0 ; i < cut ; i ++) + { + __child [i] = __par1 [i] ; + v [__par1 [i]] = true ; + } /* Searching the vertex of the second path, that ended the previous first one */ - unsigned from = 0 ; - for (unsigned i = 0 ; i < __par2.size () ; i ++) + unsigned int from = 0 ; + for (unsigned int i = 0 ; i < __par2.size () ; i ++) { - if (__par2 [i] == __child [cut - 1]) { - from = i ; - break ; - } + if (__par2 [i] == __child [cut - 1]) + { + from = i ; + break ; + } } /* Selecting a direction @@ -55,11 +58,11 @@ void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __ /* Copy of the left vertices from the second parent path */ - unsigned l = cut ; + unsigned int l = cut ; - for (unsigned i = 0 ; i < __par2.size () ; i ++) + for (unsigned int i = 0 ; i < __par2.size () ; i ++) { - unsigned bidule /* :-) */ = (direct * i + from + __par2.size ()) % __par2.size () ; + unsigned int bidule /* :-) */ = (direct * i + from + __par2.size ()) % __par2.size () ; if (! v [__par2 [bidule]]) { __child [l ++] = __par2 [bidule] ; @@ -70,7 +73,8 @@ void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __ v.clear(); } -bool OrderXover :: operator () (Route & __route1, Route & __route2) { +bool OrderXover :: operator () (Route & __route1, Route & __route2) +{ // Init. copy Route par [2] ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h index e41761b6d..587c35652 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/order_xover.h @@ -17,12 +17,13 @@ #include "route.h" /** Order Crossover */ -class OrderXover : public eoQuadOp { +class OrderXover : public eoQuadOp +{ public : bool operator () (Route & __route1, Route & __route2) ; - + private : void cross (const Route & __par1, const Route & __par2, Route & __child) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp index 8f0ba935a..53e41a5d4 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.cpp @@ -12,22 +12,16 @@ #include "part_route_eval.h" #include "graph.h" -PartRouteEval :: PartRouteEval (float __from, - float __to - ) : from (__from), - to (__to) { - -} +PartRouteEval :: PartRouteEval (float __from, float __to) : from (__from), to (__to) {} -void PartRouteEval :: operator () (Route & __route) { - - +void PartRouteEval :: operator () (Route & __route) +{ float len = 0 ; - for (unsigned i = (unsigned) (__route.size () * from) ; - i < (unsigned) (__route.size () * to) ; - i ++) - len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; + for (unsigned int i = (unsigned int) (__route.size () * from) ; i < (unsigned int ) (__route.size () * to) ; i ++) + { + len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; + } __route.fitness (len) ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h index 8ad5886d4..2fbd3b35c 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_route_eval.h @@ -17,19 +17,20 @@ #include "route.h" /** Route Evaluator */ -class PartRouteEval : public eoEvalFunc { +class PartRouteEval : public eoEvalFunc +{ public : - + /** Constructor */ PartRouteEval (float __from, float __to) ; - + void operator () (Route & __route) ; private : float from, to ; - + } ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp index 05b12925c..9f674916c 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.cpp @@ -13,8 +13,8 @@ #include "part_two_opt_init.h" -void PartTwoOptInit :: operator () (TwoOpt & __move, const Route & __route) { - +void PartTwoOptInit :: operator () (TwoOpt & __move, const Route & __route) +{ __move.first = rng.random (__route.size () - 6) ; __move.second = __move.first + 2 ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h index 3c76407f3..406a4c64f 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_init.h @@ -17,7 +17,8 @@ #include "two_opt.h" /** It sets the first couple of edges */ -class PartTwoOptInit : public moMoveInit { +class PartTwoOptInit : public moMoveInit +{ public : diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp index e7b1d7665..3fab484ec 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.cpp @@ -12,19 +12,21 @@ #include "part_two_opt_next.h" #include "graph.h" -bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) { - +bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) +{ if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2) - return false ; - - else { - - __move.second ++ ; - if (__move.second == Graph :: size () - 1) { - __move.first ++ ; - __move.second = __move.first + 2 ; + { + return false ; + } + else + { + __move.second ++ ; + if (__move.second == Graph :: size () - 1) + { + __move.first ++ ; + __move.second = __move.first + 2 ; + } + + return true ; } - - return true ; - } } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h index 67c95e1bb..e9ef5bb4e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/part_two_opt_next.h @@ -16,8 +16,9 @@ #include "two_opt.h" /** It updates a couple of edges */ -class PartTwoOptNext : public moNextMove { - +class PartTwoOptNext : public moNextMove +{ + public : bool operator () (TwoOpt & __move, const Route & __route) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp index 9414a5c9c..2c57e70a3 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/partial_mapped_xover.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include @@ -19,25 +19,26 @@ #include "route_valid.h" #include "mix.h" -void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) { +void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) +{ + + std::vector v; // Number of times a cities are visited ... - vector v; // Number of times a cities are visited ... - v.resize(__route.size ()); - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { v [i] = 0 ; } - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { v [__route [i]] ++ ; } - std :: vector vert ; + std :: vector vert ; - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { if (! v [i]) { @@ -47,7 +48,7 @@ void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __ mix (vert) ; - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { if (i < __cut1 || i >= __cut2) { @@ -62,16 +63,20 @@ void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __ v.clear(); } -bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) { - - unsigned cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ; +bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) +{ + unsigned int cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ; if (cut2 < cut1) - std :: swap (cut1, cut2) ; + { + std :: swap (cut1, cut2) ; + } // Between the cuts - for (unsigned i = cut1 ; i < cut2 ; i ++) - std :: swap (__route1 [i], __route2 [i]) ; + for (unsigned int i = cut1 ; i < cut2 ; i ++) + { + std :: swap (__route1 [i], __route2 [i]) ; + } // Outside the cuts repair (__route1, cut1, cut2) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h index cde1f96ba..2489b63bc 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route.h @@ -14,6 +14,6 @@ #include -typedef eoVector Route ; // [Fitness (- length), Gene (city)] +typedef eoVector Route ; // [Fitness (- length), Gene (city)] #endif diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp index 09be9102c..0d0d6e413 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.cpp @@ -12,12 +12,15 @@ #include "route_eval.h" #include "graph.h" -void RouteEval :: operator () (Route & __route) { +void RouteEval :: operator () (Route & __route) +{ float len = 0 ; - for (unsigned i = 0 ; i < Graph :: size () ; i ++) - len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; + for (unsigned int i = 0 ; i < Graph :: size () ; i ++) + { + len -= Graph :: distance (__route [i], __route [(i + 1) % Graph :: size ()]) ; + } __route.fitness (len) ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h index 60b38661e..69b9c7737 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_eval.h @@ -17,10 +17,11 @@ #include "route.h" /** Route Evaluator */ -class RouteEval : public eoEvalFunc { +class RouteEval : public eoEvalFunc +{ public : - + void operator () (Route & __route) ; } ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp index c37c1652e..f22ca1bf2 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.cpp @@ -14,21 +14,25 @@ #include "route_init.h" #include "graph.h" -void RouteInit :: operator () (Route & __route) { - +void RouteInit :: operator () (Route & __route) +{ + // Init. __route.clear () ; - for (unsigned i = 0 ; i < Graph :: size () ; i ++) - __route.push_back (i) ; + for (unsigned int i = 0 ; i < Graph :: size () ; i ++) + { + __route.push_back (i) ; + } // Swap. cities - for (unsigned i = 0 ; i < Graph :: size () ; i ++) { - //unsigned j = rng.random (Graph :: size ()) ; - - unsigned j = (unsigned) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ; - unsigned city = __route [i] ; - __route [i] = __route [j] ; - __route [j] = city ; - } + for (unsigned int i = 0 ; i < Graph :: size () ; i ++) + { + //unsigned int j = rng.random (Graph :: size ()) ; + + unsigned int j = (unsigned int) (Graph :: size () * (rand () / (RAND_MAX + 1.0))) ; + unsigned int city = __route [i] ; + __route [i] = __route [j] ; + __route [j] = city ; + } } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h index ab6b7ecb1..654c1a926 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_init.h @@ -16,7 +16,8 @@ #include "route.h" -class RouteInit : public eoInit { +class RouteInit : public eoInit +{ public : diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp index 057ebb722..be4c7fc0c 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/route_valid.cpp @@ -11,24 +11,25 @@ #include "route_valid.h" -#include +#include -bool valid (Route & __route) { +bool valid (Route & __route) +{ - vector t; + std::vector t; t.resize(__route.size()); - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { t [i] = 0 ; } - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { t [__route [i]] ++ ; } - for (unsigned i = 0 ; i < __route.size () ; i ++) + for (unsigned int i = 0 ; i < __route.size () ; i ++) { if (t [i] != 1) { diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp index ad1bc0400..9aa779d50 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.cpp @@ -11,32 +11,37 @@ #include "two_opt.h" -TwoOpt TwoOpt :: operator ! () const { - +TwoOpt TwoOpt :: operator ! () const +{ TwoOpt move = * this ; std :: swap (move.first, move.second) ; return move ; } -void TwoOpt :: operator () (Route & __route) { +void TwoOpt :: operator () (Route & __route) +{ - std :: vector seq_cities ; + std :: vector seq_cities ; - for (unsigned i = second ; i > first ; i --) - seq_cities.push_back (__route [i]) ; + for (unsigned int i = second ; i > first ; i --) + { + seq_cities.push_back (__route [i]) ; + } - unsigned j = 0 ; - for (unsigned i = first + 1 ; i < second + 1 ; i ++) - __route [i] = seq_cities [j ++] ; + unsigned int j = 0 ; + for (unsigned int i = first + 1 ; i < second + 1 ; i ++) + { + __route [i] = seq_cities [j ++] ; + } } -void TwoOpt :: readFrom (std :: istream & __is) { - +void TwoOpt :: readFrom (std :: istream & __is) +{ __is >> first >> second ; } -void TwoOpt :: printOn (std :: ostream & __os) const { - +void TwoOpt :: printOn (std :: ostream & __os) const +{ __os << first << ' ' << second ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h index 395b13442..279a813c9 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt.h @@ -19,16 +19,17 @@ #include "route.h" -class TwoOpt : public moMove , public std :: pair , public eoPersistent { - +class TwoOpt : public moMove , public std :: pair , public eoPersistent +{ + public : TwoOpt operator ! () const ; - + void operator () (Route & __route) ; - + void readFrom (std :: istream & __is) ; - + void printOn (std :: ostream & __os) const ; } ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp index 41adba2ab..1b371104b 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.cpp @@ -12,13 +12,17 @@ #include "two_opt_incr_eval.h" #include "graph.h" -float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) { - +float TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) +{ // From - unsigned v1 = __route [__move.first], v1_next = __route [__move.first + 1] ; + unsigned int v1 = __route [__move.first], v1_next = __route [__move.first + 1] ; // To - unsigned v2 = __route [__move.second], v2_next = __route [__move.second + 1] ; + unsigned int v2 = __route [__move.second], v2_next = __route [__move.second + 1] ; - return __route.fitness () - Graph :: distance (v1, v2) - Graph :: distance (v1_next, v2_next) + Graph :: distance (v1, v1_next) + Graph :: distance (v2, v2_next) ; + return __route.fitness () + - Graph :: distance (v1, v2) + - Graph :: distance (v1_next, v2_next) + + Graph :: distance (v1, v1_next) + + Graph :: distance (v2, v2_next) ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h index 64581c9f6..233cb264d 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_incr_eval.h @@ -15,8 +15,9 @@ #include #include "two_opt.h" -class TwoOptIncrEval : public moMoveIncrEval { - +class TwoOptIncrEval : public moMoveIncrEval +{ + public : float operator () (const TwoOpt & __move, const Route & __route) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp index 63a53df84..bc464f6ad 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.cpp @@ -11,8 +11,8 @@ #include "two_opt_init.h" -void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) { - +void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) +{ __move.first = 0 ; __move.second = 2 ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h index b0dc1d963..b8460f69e 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_init.h @@ -17,7 +17,8 @@ #include "two_opt.h" /** It sets the first couple of edges */ -class TwoOptInit : public moMoveInit { +class TwoOptInit : public moMoveInit +{ public : diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp index 0fd1cdf1f..d0b297f51 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.cpp @@ -12,19 +12,21 @@ #include "two_opt_next.h" #include "graph.h" -bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) { - +bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) +{ if (__move.first == Graph :: size () - 4 && __move.second == __move.first + 2) - return false ; - - else { - - __move.second ++ ; - if (__move.second == Graph :: size () - 1) { - __move.first ++ ; - __move.second = __move.first + 2 ; + { + return false ; + } + else + { + __move.second ++ ; + if (__move.second == Graph :: size () - 1) + { + __move.first ++ ; + __move.second = __move.first + 2 ; + } + + return true ; } - - return true ; - } } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h index bacdcdfb0..ac60bc3e6 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_next.h @@ -16,8 +16,9 @@ #include "two_opt.h" /** It updates a couple of edges */ -class TwoOptNext : public moNextMove { - +class TwoOptNext : public moNextMove +{ + public : bool operator () (TwoOpt & __move, const Route & __route) ; diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp index 5bf3e37b1..7db7f6cb7 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.cpp @@ -13,8 +13,8 @@ #include "graph.h" #include -void TwoOptRand :: operator () (TwoOpt & __move) { - +void TwoOptRand :: operator () (TwoOpt & __move) +{ __move.first = rng.random (Graph :: size () - 3) ; __move.second = __move.first + 2 + rng.random (Graph :: size () - __move.first - 3) ; } diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h index ce26889a5..600cf8b77 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_rand.h @@ -16,7 +16,8 @@ #include "two_opt.h" -class TwoOptRand : public moRandMove { +class TwoOptRand : public moRandMove +{ public : diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp index c8bca955f..f5492cde3 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.cpp @@ -14,40 +14,40 @@ #define TABU_LENGTH 10 -void TwoOptTabuList :: init () { - +void TwoOptTabuList :: init () +{ // Size (eventually) tabu_span.resize (Graph :: size ()) ; - for (unsigned i = 0 ; i < tabu_span.size () ; i ++) + for (unsigned int i = 0 ; i < tabu_span.size () ; i ++) { tabu_span [i].resize (Graph :: size ()) ; } // Clear - for (unsigned i = 0 ; i < tabu_span.size () ; i ++) + for (unsigned int i = 0 ; i < tabu_span.size () ; i ++) { - for (unsigned j = 0 ; j < tabu_span [i].size () ; j ++) + for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++) { tabu_span [i] [j] = 0 ; } } } -bool TwoOptTabuList :: operator () (const TwoOpt & __move, const Route & __sol) { - +bool TwoOptTabuList :: operator () (const TwoOpt & __move, const Route & __sol) +{ return tabu_span [__move.first] [__move.second] > 0 ; } -void TwoOptTabuList :: add (const TwoOpt & __move, const Route & __sol) { - +void TwoOptTabuList :: add (const TwoOpt & __move, const Route & __sol) +{ tabu_span [__move.first] [__move.second] = tabu_span [__move.second] [__move.first] = TABU_LENGTH ; } -void TwoOptTabuList :: update () { - - for (unsigned i = 0 ; i < tabu_span.size () ; i ++) +void TwoOptTabuList :: update () +{ + for (unsigned int i = 0 ; i < tabu_span.size () ; i ++) { - for (unsigned j = 0 ; j < tabu_span [i].size () ; j ++) + for (unsigned int j = 0 ; j < tabu_span [i].size () ; j ++) { if (tabu_span [i] [j] > 0) { diff --git a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h index d42de82d3..29c6c8439 100644 --- a/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h +++ b/trunk/paradiseo-mo/tutorial/examples/tsp/src/two_opt_tabu_list.h @@ -17,8 +17,8 @@ #include "route.h" /** The table of tabu movements, i.e. forbidden edges */ -class TwoOptTabuList : public moTabuList { - +class TwoOptTabuList : public moTabuList +{ public : bool operator () (const TwoOpt & __move, const Route & __sol) ; @@ -26,7 +26,7 @@ public : void add (const TwoOpt & __move, const Route & __sol) ; void update () ; - + void init () ; private :