From 110a23e09c66df5c9a47f20b2c5df77febeef2d8 Mon Sep 17 00:00:00 2001 From: legrand Date: Fri, 29 Jun 2007 11:39:56 +0000 Subject: [PATCH] deleted old stuff git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@463 331e1502-861f-0410-8da2-ba01fb791d7f --- trunk/paradiseo-peo/COPYING | 340 ------------ trunk/paradiseo-peo/ChangeLog | 0 trunk/paradiseo-peo/INSTALL | 236 --------- trunk/paradiseo-peo/Makefile.am | 36 -- trunk/paradiseo-peo/NEWS | 0 trunk/paradiseo-peo/TODO | 0 trunk/paradiseo-peo/autogen.sh | 127 ----- trunk/paradiseo-peo/configure.in | 97 ---- trunk/paradiseo-peo/examples/Makefile.am | 12 - trunk/paradiseo-peo/examples/Makefile.in | 454 ---------------- .../examples/data/eil101.opt.tour | 108 ---- trunk/paradiseo-peo/examples/data/eil101.tsp | 108 ---- .../examples/lesson1/Makefile.am | 29 - .../examples/lesson1/Makefile.in | 353 ------------- trunk/paradiseo-peo/examples/lesson1/doclsn.h | 498 ------------------ .../examples/lesson1/lesson.param | 12 - trunk/paradiseo-peo/examples/lesson1/main.cpp | 79 --- .../lesson1/paradiseo-peo-lsn.doxyfile | 241 --------- .../paradiseo-peo/examples/lesson1/schema.xml | 18 - .../examples/lesson2/Makefile.am | 29 - .../examples/lesson2/Makefile.in | 427 --------------- .../examples/lesson2/lesson.param | 12 - trunk/paradiseo-peo/examples/lesson2/main.cpp | 162 ------ .../lesson2/paradiseo-peo-lsn.doxyfile | 241 --------- .../paradiseo-peo/examples/lesson2/schema.xml | 18 - .../paradiseo-peo/examples/shared/Makefile.am | 49 -- .../paradiseo-peo/examples/shared/Makefile.in | 495 ----------------- .../examples/shared/city_swap.cpp | 21 - .../paradiseo-peo/examples/shared/city_swap.h | 26 - trunk/paradiseo-peo/examples/shared/data.cpp | 98 ---- trunk/paradiseo-peo/examples/shared/data.h | 18 - .../paradiseo-peo/examples/shared/display.cpp | 117 ---- trunk/paradiseo-peo/examples/shared/display.h | 16 - .../examples/shared/display_best_route.cpp | 22 - .../examples/shared/display_best_route.h | 32 -- .../examples/shared/edge_xover.cpp | 118 ----- .../examples/shared/edge_xover.h | 43 -- .../examples/shared/merge_route_eval.cpp | 17 - .../examples/shared/merge_route_eval.h | 24 - trunk/paradiseo-peo/examples/shared/mix.h | 25 - trunk/paradiseo-peo/examples/shared/node.cpp | 77 --- trunk/paradiseo-peo/examples/shared/node.h | 26 - .../examples/shared/opt_route.cpp | 107 ---- .../paradiseo-peo/examples/shared/opt_route.h | 23 - .../examples/shared/order_xover.cpp | 64 --- .../examples/shared/order_xover.h | 28 - .../shared/paradiseo-peo-lsn-shared.doxyfile | 240 --------- trunk/paradiseo-peo/examples/shared/param.cpp | 23 - trunk/paradiseo-peo/examples/shared/param.h | 14 - .../examples/shared/part_route_eval.cpp | 30 -- .../examples/shared/part_route_eval.h | 33 -- .../examples/shared/partial_mapped_xover.cpp | 61 --- .../examples/shared/partial_mapped_xover.h | 28 - trunk/paradiseo-peo/examples/shared/route.cpp | 21 - trunk/paradiseo-peo/examples/shared/route.h | 20 - .../examples/shared/route_eval.cpp | 14 - .../examples/shared/route_eval.h | 23 - .../examples/shared/route_init.cpp | 23 - .../examples/shared/route_init.h | 23 - .../paradiseo-peo/examples/shared/two_opt.cpp | 20 - trunk/paradiseo-peo/examples/shared/two_opt.h | 25 - .../examples/shared/two_opt_incr_eval.cpp | 24 - .../examples/shared/two_opt_incr_eval.h | 23 - .../examples/shared/two_opt_init.cpp | 14 - .../examples/shared/two_opt_init.h | 24 - .../examples/shared/two_opt_next.cpp | 27 - .../examples/shared/two_opt_next.h | 24 - .../examples/shared/two_opt_rand.cpp | 21 - .../examples/shared/two_opt_rand.h | 24 - 69 files changed, 5862 deletions(-) delete mode 100755 trunk/paradiseo-peo/COPYING delete mode 100755 trunk/paradiseo-peo/ChangeLog delete mode 100755 trunk/paradiseo-peo/INSTALL delete mode 100755 trunk/paradiseo-peo/Makefile.am delete mode 100755 trunk/paradiseo-peo/NEWS delete mode 100755 trunk/paradiseo-peo/TODO delete mode 100755 trunk/paradiseo-peo/autogen.sh delete mode 100755 trunk/paradiseo-peo/configure.in delete mode 100644 trunk/paradiseo-peo/examples/Makefile.am delete mode 100644 trunk/paradiseo-peo/examples/Makefile.in delete mode 100644 trunk/paradiseo-peo/examples/data/eil101.opt.tour delete mode 100644 trunk/paradiseo-peo/examples/data/eil101.tsp delete mode 100755 trunk/paradiseo-peo/examples/lesson1/Makefile.am delete mode 100644 trunk/paradiseo-peo/examples/lesson1/Makefile.in delete mode 100644 trunk/paradiseo-peo/examples/lesson1/doclsn.h delete mode 100644 trunk/paradiseo-peo/examples/lesson1/lesson.param delete mode 100644 trunk/paradiseo-peo/examples/lesson1/main.cpp delete mode 100644 trunk/paradiseo-peo/examples/lesson1/paradiseo-peo-lsn.doxyfile delete mode 100644 trunk/paradiseo-peo/examples/lesson1/schema.xml delete mode 100755 trunk/paradiseo-peo/examples/lesson2/Makefile.am delete mode 100644 trunk/paradiseo-peo/examples/lesson2/Makefile.in delete mode 100644 trunk/paradiseo-peo/examples/lesson2/lesson.param delete mode 100644 trunk/paradiseo-peo/examples/lesson2/main.cpp delete mode 100644 trunk/paradiseo-peo/examples/lesson2/paradiseo-peo-lsn.doxyfile delete mode 100644 trunk/paradiseo-peo/examples/lesson2/schema.xml delete mode 100644 trunk/paradiseo-peo/examples/shared/Makefile.am delete mode 100644 trunk/paradiseo-peo/examples/shared/Makefile.in delete mode 100644 trunk/paradiseo-peo/examples/shared/city_swap.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/city_swap.h delete mode 100644 trunk/paradiseo-peo/examples/shared/data.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/data.h delete mode 100644 trunk/paradiseo-peo/examples/shared/display.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/display.h delete mode 100644 trunk/paradiseo-peo/examples/shared/display_best_route.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/display_best_route.h delete mode 100644 trunk/paradiseo-peo/examples/shared/edge_xover.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/edge_xover.h delete mode 100644 trunk/paradiseo-peo/examples/shared/merge_route_eval.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/merge_route_eval.h delete mode 100644 trunk/paradiseo-peo/examples/shared/mix.h delete mode 100644 trunk/paradiseo-peo/examples/shared/node.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/node.h delete mode 100644 trunk/paradiseo-peo/examples/shared/opt_route.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/opt_route.h delete mode 100644 trunk/paradiseo-peo/examples/shared/order_xover.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/order_xover.h delete mode 100644 trunk/paradiseo-peo/examples/shared/paradiseo-peo-lsn-shared.doxyfile delete mode 100644 trunk/paradiseo-peo/examples/shared/param.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/param.h delete mode 100644 trunk/paradiseo-peo/examples/shared/part_route_eval.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/part_route_eval.h delete mode 100644 trunk/paradiseo-peo/examples/shared/partial_mapped_xover.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/partial_mapped_xover.h delete mode 100644 trunk/paradiseo-peo/examples/shared/route.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/route.h delete mode 100644 trunk/paradiseo-peo/examples/shared/route_eval.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/route_eval.h delete mode 100644 trunk/paradiseo-peo/examples/shared/route_init.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/route_init.h delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt.h delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.h delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_init.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_init.h delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_next.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_next.h delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_rand.cpp delete mode 100644 trunk/paradiseo-peo/examples/shared/two_opt_rand.h diff --git a/trunk/paradiseo-peo/COPYING b/trunk/paradiseo-peo/COPYING deleted file mode 100755 index 8b215f700..000000000 --- a/trunk/paradiseo-peo/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/trunk/paradiseo-peo/ChangeLog b/trunk/paradiseo-peo/ChangeLog deleted file mode 100755 index e69de29bb..000000000 diff --git a/trunk/paradiseo-peo/INSTALL b/trunk/paradiseo-peo/INSTALL deleted file mode 100755 index 56b077d6a..000000000 --- a/trunk/paradiseo-peo/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -================== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. - - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. - -Installation Names -================== - -By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PREFIX', the package will -use PREFIX as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). Here is a another example: - - /bin/bash ./configure CONFIG_SHELL=/bin/bash - -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/trunk/paradiseo-peo/Makefile.am b/trunk/paradiseo-peo/Makefile.am deleted file mode 100755 index a23a71d41..000000000 --- a/trunk/paradiseo-peo/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## Process this file with automake to produce Makefile.in -## Created by Anjuta - will be overwritten -## If you don't want it to overwrite it, -## Please disable it in the Anjuta project configuration - -SUBDIRS = src examples docs - -libparadiseodocdir = ${prefix}/docs/paradisEO -libparadiseodoc_DATA = \ - README\ - COPYING\ - AUTHORS\ - ChangeLog\ - INSTALL\ - NEWS\ - TODO - -EXTRA_DIST = $(libparadiseodoc_DATA) - -# Add documentation to distribution -dist-hook: - for specfile in *.spec; do \ - if test -f $$specfile; then \ - cp -p $$specfile $(distdir); \ - fi \ - done - $(MAKE) documentation - $(INSTALL_DATA) -d $(srcdir)/docs/html $(srcdir)/docs/latex $(srcdir)/docs/man $(distdir)/docs/ - -# Prepare documentation -documentation: - cd docs && $(MAKE) doc && cd .. && cd examples && $(MAKE) doc && cd .. - -# convenience-target -doc: documentation - diff --git a/trunk/paradiseo-peo/NEWS b/trunk/paradiseo-peo/NEWS deleted file mode 100755 index e69de29bb..000000000 diff --git a/trunk/paradiseo-peo/TODO b/trunk/paradiseo-peo/TODO deleted file mode 100755 index e69de29bb..000000000 diff --git a/trunk/paradiseo-peo/autogen.sh b/trunk/paradiseo-peo/autogen.sh deleted file mode 100755 index 245311580..000000000 --- a/trunk/paradiseo-peo/autogen.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -PKG_NAME="the package." - -DIE=0 - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`autoconf' installed to." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && { - (libtool --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`libtool' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/" - echo "(or a newer version if it is available)" - DIE=1 - } -} - -(automake --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: You must have \`automake' installed." - echo "Get ftp://ftp.gnu.org/pub/gnu/" - echo "(or a newer version if it is available)" - DIE=1 - NO_AUTOMAKE=yes -} - - -# if no automake, don't bother testing for aclocal -test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "**Error**: Missing \`aclocal'. The version of \`automake'" - echo "installed doesn't appear recent enough." - echo "Get ftp://ftp.gnu.org/pub/gnu/" - echo "(or a newer version if it is available)" - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -if test -z "$*"; then - echo "**Warning**: I am going to run \`configure' with no arguments." - echo "If you wish to pass any to it, please specify them on the" - echo \`$0\'" command line." - echo -fi - -case $CC in -xlc ) - am_opt=--include-deps;; -esac - -for coin in `find $srcdir -name configure.in -print` -do - dr=`dirname $coin` - if test -f $dr/NO-AUTO-GEN; then - echo skipping $dr -- flagged as no auto-gen - else - echo processing $dr - macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` - ( cd $dr - aclocalinclude="$ACLOCAL_FLAGS" - for k in $macrodirs; do - if test -d $k; then - aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." - fi - done - if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then - if grep "sed.*POTFILES" configure.in >/dev/null; then - : do nothing -- we still have an old unmodified configure.in - else - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - ./setup-gettext - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - fi - if grep "^AM_GNOME_GETTEXT" configure.in >/dev/null; then - echo "Creating $dr/aclocal.m4 ..." - test -r $dr/aclocal.m4 || touch $dr/aclocal.m4 - echo "Running gettextize... Ignore non-fatal messages." - ./setup-gettext - echo "Making $dr/aclocal.m4 writable ..." - test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4 - fi - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy - fi - test -d m4 && aclocalinclude="$aclocalinclude -I m4" - echo "Running aclocal $aclocalinclude ..." - aclocal $aclocalinclude - if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then - echo "Running autoheader..." - autoheader - fi - echo "Running automake --gnu $am_opt ..." - automake --add-missing --gnu $am_opt - echo "Running autoconf ..." - autoconf - ) - fi -done - -#conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c - -if test x$NOCONFIGURE = x; then - echo Running $srcdir/configure $conf_flags "$@" ... - $srcdir/configure $conf_flags "$@" \ - && echo Now type \`make\' to compile $PKG_NAME -else - echo Skipping configure process. -fi diff --git a/trunk/paradiseo-peo/configure.in b/trunk/paradiseo-peo/configure.in deleted file mode 100755 index d34b86c96..000000000 --- a/trunk/paradiseo-peo/configure.in +++ /dev/null @@ -1,97 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl Created by Anjuta - will be overwritten -dnl If you don't want it to overwrite it, -dnl Please disable it in the Anjuta project configuration - -AC_INIT(configure.in) -AM_INIT_AUTOMAKE(paradisEO, 0.3) -dnl AM_CONFIG_HEADER(config.h) - -dnl Autoconf 2.6 or higher compatibility -AC_DEFUN([AC_DATAROOTDIR_CHECKED]) - -AC_ISC_POSIX -CXXFLAGS="" -AC_SUBST(CXXFLAGS) -AC_PROG_CXX -AM_PROG_CC_STDC -AC_HEADER_STDC -AC_PROG_RANLIB - - -AC_SUBST(EO_DIR) - -dnl EO -AC_ARG_WITH(EOdir, - --with-EOdir : Giving the path of the EO tree., - dnl Well done :-) - EO_DIR="$withval" - if test ! -d $EO_DIR - then - echo "" - echo "# --with-EOdir Invalid directory $withval" - exit 1 - fi, - dnl Bouhhhh !!!! - echo "" - echo "# You forgot to give the path of the EO tree !" - echo "# Please write something like ... './configure --with-EOdir=\$HOME/eo'" - exit 1 - ) - - -AC_SUBST(MO_DIR) - -dnl MO -AC_ARG_WITH(MOdir, - --with-MOdir : Giving the path of the MO tree., - dnl Well done :-) - MO_DIR="$withval" - if test ! -d $MO_DIR - then - echo "" - echo "# --with-MOdir Invalid directory $withval" - exit 1 - fi, - dnl Bouhhhh !!!! - echo "" - echo "# You forgot to give the path of the MO tree !" - echo "# Please write something like ... './configure --with-MOdir=\$HOME/mo'" - exit 1 - ) - - -AC_SUBST(MOEO_DIR) - -dnl MOEO -AC_ARG_WITH(MOEOdir, - --with-MOEOdir : Giving the path of the MOEO tree., - dnl Well done :-) - MOEO_DIR="$withval" - if test ! -d $MOEO_DIR - then - echo "" - echo "# --with-MOEOdir Invalid directory $withval" - exit 1 - fi, - dnl Bouhhhh !!!! - echo "" - echo "# You forgot to give the path of the MOEO tree !" - echo "# Please write something like ... './configure --with-MOEOdir=\$HOME/moeo'" - exit 1 - ) - - -AC_OUTPUT([ -Makefile -docs/Makefile -examples/Makefile -examples/shared/Makefile -examples/lesson1/Makefile -examples/lesson2/Makefile -src/Makefile -src/core/Makefile -src/rmc/Makefile -src/rmc/mpi/Makefile -]) - diff --git a/trunk/paradiseo-peo/examples/Makefile.am b/trunk/paradiseo-peo/examples/Makefile.am deleted file mode 100644 index f22564acb..000000000 --- a/trunk/paradiseo-peo/examples/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Makefile.am for paradiseo/examples - - -SUBDIRS = shared lesson1 lesson2 - -doc: - mkdir ../docs/html/lsnshared; cd shared && doxygen paradiseo-peo-lsn-shared.doxyfile && cd .. - for ex in `ls | grep lesson`; do mkdir ../docs/html/$$ex; `cd $$ex && doxygen paradiseo-peo-lsn.doxyfile`; done - -clean-local: - rm -fr ../docs/html/lsnshared; cd shared && rm -fr html latex man && cd .. - for ex in `ls | grep lesson`; do rm -fr ../docs/html/$$ex; `cd $$ex && rm -fr html latex man`; done diff --git a/trunk/paradiseo-peo/examples/Makefile.in b/trunk/paradiseo-peo/examples/Makefile.in deleted file mode 100644 index 0bb86c5ad..000000000 --- a/trunk/paradiseo-peo/examples/Makefile.in +++ /dev/null @@ -1,454 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = examples -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive -ETAGS = etags -CTAGS = ctags -DIST_SUBDIRS = $(SUBDIRS) -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EO_DIR = @EO_DIR@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MOEO_DIR = @MOEO_DIR@ -MO_DIR = @MO_DIR@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -SUBDIRS = shared lesson1 lesson2 -all: all-recursive - -.SUFFIXES: -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -uninstall-info-am: - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ - include_option=--etags-include; \ - empty_fix=.; \ - else \ - include_option=--include; \ - empty_fix=; \ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ - || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ - distdir) \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-recursive -all-am: Makefile -installdirs: installdirs-recursive -installdirs-am: -install: install-recursive -install-exec: install-exec-recursive -install-data: install-data-recursive -uninstall: uninstall-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-recursive - -clean-am: clean-generic clean-local mostlyclean-am - -distclean: distclean-recursive - -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-tags - -dvi: dvi-recursive - -dvi-am: - -html: html-recursive - -info: info-recursive - -info-am: - -install-data-am: - -install-exec-am: - -install-info: install-info-recursive - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-recursive - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-recursive - -mostlyclean-am: mostlyclean-generic - -pdf: pdf-recursive - -pdf-am: - -ps: ps-recursive - -ps-am: - -uninstall-am: uninstall-info-am - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-local clean-recursive ctags \ - ctags-recursive distclean distclean-generic \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic maintainer-clean-recursive \ - mostlyclean mostlyclean-generic mostlyclean-recursive pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am - - -doc: - mkdir ../docs/html/lsnshared; cd shared && doxygen paradiseo-peo-lsn-shared.doxyfile && cd .. - for ex in `ls | grep lesson`; do mkdir ../docs/html/$$ex; `cd $$ex && doxygen paradiseo-peo-lsn.doxyfile`; done - -clean-local: - rm -fr ../docs/html/lsnshared; cd shared && rm -fr html latex man && cd .. - for ex in `ls | grep lesson`; do rm -fr ../docs/html/$$ex; `cd $$ex && rm -fr html latex man`; done -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/trunk/paradiseo-peo/examples/data/eil101.opt.tour b/trunk/paradiseo-peo/examples/data/eil101.opt.tour deleted file mode 100644 index 1d3fece5a..000000000 --- a/trunk/paradiseo-peo/examples/data/eil101.opt.tour +++ /dev/null @@ -1,108 +0,0 @@ -NAME : eil101.opt.tour -COMMENT : Optimum tour for eil101.tsp (Length 629) -TYPE : TOUR -DIMENSION : 101 -TOUR_SECTION -1 -69 -27 -101 -53 -28 -26 -12 -80 -68 -29 -24 -54 -55 -25 -4 -39 -67 -23 -56 -75 -41 -22 -74 -72 -73 -21 -40 -58 -13 -94 -95 -97 -87 -2 -57 -15 -43 -42 -14 -44 -38 -86 -16 -61 -85 -91 -100 -98 -37 -92 -59 -93 -99 -96 -6 -89 -52 -18 -83 -60 -5 -84 -17 -45 -8 -46 -47 -36 -49 -64 -63 -90 -32 -10 -62 -11 -19 -48 -82 -7 -88 -31 -70 -30 -20 -66 -71 -65 -35 -34 -78 -81 -9 -51 -33 -79 -3 -77 -76 -50 --1 -EOF diff --git a/trunk/paradiseo-peo/examples/data/eil101.tsp b/trunk/paradiseo-peo/examples/data/eil101.tsp deleted file mode 100644 index 9672f849e..000000000 --- a/trunk/paradiseo-peo/examples/data/eil101.tsp +++ /dev/null @@ -1,108 +0,0 @@ -NAME : eil101 -COMMENT : 101-city problem (Christofides/Eilon) -TYPE : TSP -DIMENSION : 101 -EDGE_WEIGHT_TYPE : EUC_2D -NODE_COORD_SECTION -1 41 49 -2 35 17 -3 55 45 -4 55 20 -5 15 30 -6 25 30 -7 20 50 -8 10 43 -9 55 60 -10 30 60 -11 20 65 -12 50 35 -13 30 25 -14 15 10 -15 30 5 -16 10 20 -17 5 30 -18 20 40 -19 15 60 -20 45 65 -21 45 20 -22 45 10 -23 55 5 -24 65 35 -25 65 20 -26 45 30 -27 35 40 -28 41 37 -29 64 42 -30 40 60 -31 31 52 -32 35 69 -33 53 52 -34 65 55 -35 63 65 -36 2 60 -37 20 20 -38 5 5 -39 60 12 -40 40 25 -41 42 7 -42 24 12 -43 23 3 -44 11 14 -45 6 38 -46 2 48 -47 8 56 -48 13 52 -49 6 68 -50 47 47 -51 49 58 -52 27 43 -53 37 31 -54 57 29 -55 63 23 -56 53 12 -57 32 12 -58 36 26 -59 21 24 -60 17 34 -61 12 24 -62 24 58 -63 27 69 -64 15 77 -65 62 77 -66 49 73 -67 67 5 -68 56 39 -69 37 47 -70 37 56 -71 57 68 -72 47 16 -73 44 17 -74 46 13 -75 49 11 -76 49 42 -77 53 43 -78 61 52 -79 57 48 -80 56 37 -81 55 54 -82 15 47 -83 14 37 -84 11 31 -85 16 22 -86 4 18 -87 28 18 -88 26 52 -89 26 35 -90 31 67 -91 15 19 -92 22 22 -93 18 24 -94 26 27 -95 25 24 -96 22 27 -97 25 21 -98 19 21 -99 20 26 -100 18 18 -101 35 35 -EOF diff --git a/trunk/paradiseo-peo/examples/lesson1/Makefile.am b/trunk/paradiseo-peo/examples/lesson1/Makefile.am deleted file mode 100755 index 30ebecce1..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -EXTRA_DIST = paradiseo-peo-lns.doxyfile foot.html - -CXX=mpicxx - -INCLUDES = \ - -I$(EO_DIR)/src/ \ - -I$(MO_DIR)/src/ \ - -I../../src/ \ - -I../shared/ - -AM_CXXFLAGS = \ - -Wall -g - -bin_PROGRAMS = \ - tspExample - -tspExample_SOURCES = \ - main.cpp - -tspExample_LDFLAGS = \ - -L$(EO_DIR)/src/ \ - -L$(EO_DIR)/src/utils \ - -L../../src/core \ - -L../../src/rmc/mpi/ \ - -L../shared/ \ - `xml2-config --libs` - -tspExample_LDADD = -lparadiseo -lrmc_mpi -leoutils -leo -ltsp_shared - diff --git a/trunk/paradiseo-peo/examples/lesson1/Makefile.in b/trunk/paradiseo-peo/examples/lesson1/Makefile.in deleted file mode 100644 index 4bdd8fe75..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/Makefile.in +++ /dev/null @@ -1,353 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -CC = @CC@ -CXXFLAGS = @CXXFLAGS@ -EO_DIR = @EO_DIR@ -HAVE_LIB = @HAVE_LIB@ -LIB = @LIB@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOEO_DIR = @MOEO_DIR@ -MO_DIR = @MO_DIR@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -VERSION = @VERSION@ - -EXTRA_DIST = paradiseo-peo-lns.doxyfile foot.html - -CXX = mpicxx - -INCLUDES = -I$(EO_DIR)/src/ -I$(MO_DIR)/src/ -I../../src/ -I../shared/ - - -AM_CXXFLAGS = -Wall -g - - -bin_PROGRAMS = tspExample - - -tspExample_SOURCES = main.cpp - - -tspExample_LDFLAGS = -L$(EO_DIR)/src/ -L$(EO_DIR)/src/utils -L../../src/core -L../../src/rmc/mpi/ -L../shared/ `xml2-config --libs` - - -tspExample_LDADD = -lparadiseo -lrmc_mpi -leoutils -leo -ltsp_shared -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -tspExample_OBJECTS = main.o -tspExample_DEPENDENCIES = -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -DEP_FILES = .deps/main.P -SOURCES = $(tspExample_SOURCES) -OBJECTS = $(tspExample_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .cpp .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/lesson1/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -tspExample: $(tspExample_OBJECTS) $(tspExample_DEPENDENCIES) - @rm -f tspExample - $(CXXLINK) $(tspExample_LDFLAGS) $(tspExample_OBJECTS) $(tspExample_LDADD) $(LIBS) -.cpp.o: - $(CXXCOMPILE) -c $< - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = examples/lesson1 - -distdir: $(DISTFILES) - here=`cd $(top_builddir) && pwd`; \ - top_distdir=`cd $(top_distdir) && pwd`; \ - distdir=`cd $(distdir) && pwd`; \ - cd $(top_srcdir) \ - && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu examples/lesson1/Makefile - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - -DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) - --include $(DEP_FILES) - -mostlyclean-depend: - -clean-depend: - -distclean-depend: - -rm -rf .deps - -maintainer-clean-depend: - -%.o: %.c - @echo '$(COMPILE) -c $<'; \ - $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.c - @echo '$(LTCOMPILE) -c $<'; \ - $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp - -%.o: %.cpp - @echo '$(CXXCOMPILE) -c $<'; \ - $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-cp .deps/$(*F).pp .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm .deps/$(*F).pp - -%.lo: %.cpp - @echo '$(LTCXXCOMPILE) -c $<'; \ - $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $< - @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \ - < .deps/$(*F).pp > .deps/$(*F).P; \ - tr ' ' '\012' < .deps/$(*F).pp \ - | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ - >> .deps/$(*F).P; \ - rm -f .deps/$(*F).pp -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-binPROGRAMS -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-tags mostlyclean-depend mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-binPROGRAMS clean-compile clean-tags clean-depend \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-binPROGRAMS distclean-compile distclean-tags \ - distclean-depend distclean-generic clean-am - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-depend maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir mostlyclean-depend \ -distclean-depend clean-depend maintainer-clean-depend info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/trunk/paradiseo-peo/examples/lesson1/doclsn.h b/trunk/paradiseo-peo/examples/lesson1/doclsn.h deleted file mode 100644 index 544edc583..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/doclsn.h +++ /dev/null @@ -1,498 +0,0 @@ -//! \mainpage Creating a simple ParadisEO-PEO Evolutionary Algorithm -//! -//! \section structure Introduction -//! -//! One of the first steps in designing an evolutionary algorithm using the ParadisEO-PEO framework -//! consists in having a clear overview of the implemented algorithm. A brief pseudo-code description is offered -//! bellow - the entire source code for the ParadisEO-PEO evolutionary algorithm is defined in the peoEA.h -//! header file. The main elements to be considered when building an evolutionary algorithm are the transformation -//! operators, i.e. crossover and mutation, the evaluation function, the continuation criterion and the selection -//! and replacement strategy. -//! -//! -//! -//! -//! -//! -//! -//! -//!
do {    
         select( population, offsprings );   // select the offsprings from the current population
         transform( offsprings );   // crossover and mutation operators are applied on the selected offsprings
         evaluate( offsprings );   // evaluation step of the resulting offsprings
         replace( population, offsprings );   // replace the individuals in the current population whith individuals from the offspring population, according to a specified replacement strategy
} while ( eaCheckpointContinue( population ) );   // checkpoint operators are applied on the current population
-//! -//! The peoEA class offers an elementary evolutionary algorithm implementation. The peoEA class has the underlying structure -//! for including parallel evaluation and parallel transformation operators, migration operators etc. Although there is -//! no restriction on using the algorithms provided by the EO framework, no parallelism is provided - the EO implementation is exclusively sequential. -//!
-//! -//! \section requirements Requirements -//! -//! You should have already installed the ParadisEO-PEO package - this requires several additional packages which should be already -//! included in the provided archive. The installation script has to be launched in order to configure and compile all the required -//! components. At the end of the installation phase you should end up having a directory tree resembling the following: -//! -//!
     ... -//!
     paradiseo-mo -//!
     paradiseo-moeo -//!
     paradiseo-peo -//!
            docs -//!
            examples -//!
                   lesson1 -//!
                   lesson2 -//!
                   ... -//!
                   shared -//!
                   ... -//!
            src -//!
            ... -//!
     ... -//! -//!
-//! -//! The source-code for this tutorial may be found in the paradiseo-peo/examples/lesson1 directory, in the main.cpp file. -//! We strongly encourage creating a backup copy of the file if you consider modifying the source code. For a complete reference on the -//! TSP-related classes and definitions please refer to the files under the paradiseo-peo/examples/shared. After the installation -//! phase you should end up having an tspExample executable file in the paradiseo-peo/examples/lesson1 directory. -//! We will discuss testing and launching aspects later in the tutorial. -//! -//! You are supposed to be familiar with working in C/C++ (with an extensive use of templates) and you should have at least an introductory -//! background in working with the EO framework. -//! -//!
-//! NOTE: All the presented examples have as case study the Traveling Salesman Problem (TSP). All the presented tutorials rely -//! on a common shared source code defining transformation operators, -//! evaluation functions, etc. for the TSP problem. For a complete understanding of the presented tutorials please take your time for -//! consulting and for studying the additional underlying defined classes. -//!

-//! -//! \section problemDef Problem Definition and Representation -//! -//! As we are not directly concerned with the Traveling Salesman Problem, and to some extent out of scope, no in depth details are offered -//! for the TSP. The problem requires finding the shortest path connecting a given set of cities, while visiting each of -//! the specified cities only once and returning to the startpoint city. The problem is known to be NP-complete, i.e. no polynomial -//! time algorithm exists for solving the problem in exact manner. -//! -//! The construction of a ParadisEO-PEO evolutionary algorithm requires following a few simple steps - please take your time to study the signature -//! of the peoEA constructor: -//! -//! -//! -//! -//!
-//!      peoEA( -//!
            eoContinue< EOT >& __cont, -//!
            peoPopEval< EOT >& __pop_eval, -//!
            eoSelect< EOT >& __select, -//!
            peoTransform< EOT >& __trans, -//!
            eoReplacement< EOT >& __replace -//!
     ); -//! 		-//! \image html peoEA.png -//!
-//! -//! A few remarks have to be made: while most of the parameters are passed as EO-specific types, the evaluation and the transformation objects have to be -//! derived from the ParadisEO-PEO peoPopEval and peoTransform classes. Derived classes like the peoParaPopEval and peoParaSGATransform classes allow -//! for parallel evaluation of the population and parallel transformation operators, respectively. Wrappers are provided thus allowing to make use -//! of the EO classes. -//! -//! In the followings, the main required elements for building an evolutionary algorithm are enumerated. For complete details regarding the -//! implementation aspects of each of the components, please refer to the common shared source code. -//! Each of the bellow referred header files may be found in the pardiseo-peo/examples/shared directory. -//! -//!
    -//!
  1. representation - the first decision to be taken concerns the representation of the individuals. You may create your -//! own representation or you may use/derive one of the predefined classes of the EO framework.
    -//! -//! For our case study, the TSP, each city is defined as a Node in the node.h header file - in fact an unsigned value defined -//! as typedef unsigned Node. Moreover, each individual (of the evolutionary algorithm) is represented as a Route object, a vector of Node objects, in -//! the route.h header file - typedef eoVector< int, Node > Route. The definition of the Route object implies two -//! elements: (1) a route is a vector of nodes, and (2) the fitness is an integer value (please refer to the eoVector -//! definition in the EO framework). -//! -//! In addition you should also take a look in the route_init.h header file which includes the RouteInit class, defined for -//! initializing in random manner Route objects. -//!
    2. -//!
  2. evaluation function - having a representation model, an evaluation object has to be defined, implementing a specific -//! fitness function. The designed class has to be derived (directly or indirectly) from the peoPopEval class - you have the choice of -//! using peoSeqPopEval or peoParaPopEval for sequential and parallel evaluation, respectively. These classes act as wrappers requiring -//! the specification of an EO evaluation object derived from the eoEvalFunc class - please refer to their respective documentation.
    -//! -//! The fitness function for our TSP case study is implemented in the route_eval.h header file. The class is derived from the eoEvalFunc -//! EO class, being defined as class RouteEval : public eoEvalFunc< Route >. -//!
    3. -//!
  3. transformation operators - in order to assure the evolution of the initial population, transformation operators have to be defined. -//! Depending on your problem, you may specify quadruple operators (two input individuals, two output resulting individuals), i.e. crossover operators, -//! binary operators (one input individual and one output resulting individual), i.e. mutation operators, or combination of both types. As for the -//! evaluation function, the signature of the peoEA constructor requires specifying a peoTransform derived object as transformation operator. -//! -//! The transform operators, crossover and mutation, for the herein presented example are defined in the order_xover.h and the city_swap.h -//! header files, respectively. -//!
    4. -//!
  4. continuation criterion - the evolutionary algorithm evolves in an iterative manner; a continuation criterion has to be specified. -//! One of the most common and simplest options considers a maximum number of generations. It is your choice whether to use -//! a predefined EO class for specifying the continuation criterion or using a custom defined class. In the later case you have to -//! make sure that your class derives the eoContinue class.
    -//!
    5. -//!
  5. selection strategy - at each iteration a set of individuals are selected for applying the transform operators, in order -//! to obtain the offspring population. As the specified parameter has to be derived from the eoSelect it is your option of whether using -//! the EO provided selection strategies or implementing your own, as long as it inherits the eoSelect class. -//! -//! For our example we chose to use the eoRankingSelect strategy, provided in the EO framework. -//!
    6. -//!
  6. replacement strategy - once the offspring population is obtained, the offsprings have to be integrated back into the initial -//! population, according to a given strategy. For custom defined strategies you have to inherit the eoReplacement EO class. We chose to -//! use an eoPlusReplacement as strategy (please review the EO documentation for details on the different strategies available). -//!
    7. -//!
-//!
-//! -//! \section example A simple example for constructing a peoEA object -//! -//! The source code for this example may be found in the main.cpp file, under the paradiseo-peo/examples/lesson1 directory. Please make sure you -//! At this point you have two options: (a) you can just follow the example without touching the main.cpp or, (b) you can start from scratch, -//! following the presented steps, in which case you are required make a backup copy of the main.cpp file and replace the original file with an -//! empty one. -//! -//!
    -//!
  1. include the necessary header files - as we will be using Route objects, we have to include the files -//! which define the Route type, the initializing functor and the evaluation functions. Furthermore, in order to make use of -//! transform operators, we require having the headers which define the crossover and the mutation operators. -//! All these files may be found in the shared directory that we mentioned in the beginning. At this point you -//! should have something like the following:
    -//! -//! 
    -//!		##include "route.h"
-//!		##include "route_init.h"
-//!		##include "route_eval.h"
-//!		
-//!		##include "order_xover.h"
-//!		##include "city_swap.h"
-//!
    -//! In addition we require having the paradiseo header file, in order to use the ParadisEO-PEO features, and a header specific -//! for our problem, dealing with processing command-line parameters - the param.h header file. The complete picture at this point -//! with all the required header files is as follows:
    -//! -//! 
    -//!		##include "route.h"
-//!		##include "route_init.h"
-//!		##include "route_eval.h"
-//!		
-//!		##include "order_xover.h"
-//!		##include "city_swap.h"
-//!
-//!		##include "param.h"
-//!
-//!		##include <paradiseo>
-//!
    -//! NOTE: the paradiseo header file is in fact a "super-header" - it includes all the esential ParadisEO-PEO header files. -//! It is at at your choice if you want use the paradiseo header file or to explicitly include different header files, -//! like the peoEA.h header file, for example. -//! -//!
    2. -//!
  2. define problem specific parameters - in our case we have to specify how many individuals we want to have in our population, the number -//! of generations for the evolutionary algorithm to iterate and the probabilities associated with the crossover and mutation operators.
    -//! -//! 
    -//!		##include "route.h"
-//!		##include "route_init.h"
-//!		##include "route_eval.h"
-//!		
-//!		##include "order_xover.h"
-//!		##include "city_swap.h"
-//!
-//!		##include "param.h"
-//!
-//!		##include <paradiseo>
-//!
-//!
-//!		##define POP_SIZE 10
-//!		##define NUM_GEN 100
-//!		##define CROSS_RATE 1.0
-//!		##define MUT_RATE 0.01
-//!
    -//!
    3. -//!
  3. construct the skeleton of a simple ParadisEO-PEO program - the main function including the code for initializing the ParadisEO-PEO -//! environment, for loading problem data and for shutting down the ParadisEO-PEO environment. From this point on we will make -//! abstraction of the previous part referring only to the main function.
    -//! -//! 
    -//!		...
-//!		
-//!		int main( int __argc, char** __argv ) {
-//!		
-//!			// initializing the ParadisEO-PEO environment
-//!			peo :: init( __argc, __argv );
-//!		
-//!			// processing the command line specified parameters
-//!			loadParameters( __argc, __argv );
-//!		
-//!
-//!			// EVOLUTIONARY ALGORITHM TO BE DEFINED
-//!
-//!		
-//!			peo :: run( );
-//!			peo :: finalize( );
-//!			// shutting down the ParadisEO-PEO environment
-//!		
-//!			return 0;
-//!		}
-//!
    -//!
    4. -//!
  4. initialization functors, evaluation function and transform operators - basically we only need to create instances for each of the -//! enumerated objects, to be passed later as parameters for higher-level components of the evolutionary algorithm.
    -//! -//! 
    -//!		RouteInit route_init;	// random init object - creates random Route objects
-//!		RouteEval full_eval;	// evaluator object - offers a fitness value for a specified Route object
-//!
-//!		OrderXover crossover;	// crossover operator - creates two offsprings out of two specified parents
-//!		CitySwap mutation;	// mutation operator - randomly mutates one gene for a specified individual
-//!
    -//!
    5. -//!
  5. construct the components of the evolutionary algorithm - each of the components that has to be passed as parameter to the -//! peoEA constructor has to be defined along with the associated parameters. Except for the requirement to provide the -//! appropriate objects (for example, a peoPopEval derived object must be specified for the evaluation functor), there is no strict -//! path to follow. It is your option what elements to mix, depending on your problem - we aimed for simplicity in our example. -//! -//!
      -//!
    • an initial population has to be specified; the constructor accepts the specification of an initializing object. Further, -//! an evaluation object is required - the peoEA constructor requires a peoPopEval derived class. -//!
      • -//!
    -//! 
    -//!		eoPop< Route > population( POP_SIZE, route_init );	// initial population for the algorithm having POP_SIZE individuals
-//!		peoSeqPopEval< Route > eaPopEval( full_eval );		// evaluator object - to be applied at each iteration on the entire population
-//!
    -//!
      -//!
    • the evolutionary algorithm continues to iterate till a continuation criterion is not met. For our case we consider -//! a fixed number of generations. The continuation criterion has to be specified as a checkpoint object, thus requiring -//! the creation of an eoCheckPoint object in addition. -//!
      • -//!
    -//! 
    -//!		eoGenContinue< Route > eaCont( NUM_GEN );		// continuation criterion - the algorithm will iterate for NUM_GEN generations
-//!		eoCheckPoint< Route > eaCheckpointContinue( eaCont );	// checkpoint object - verify at each iteration if the continuation criterion is met
-//!
    -//!
      -//!
    • selection strategy - we are required to specify a selection strategy for extracting individuals out of the parent -//! population; in addition the number of individuals to be selected has to be specified. -//!
      • -//!
    -//! 
    -//!		eoRankingSelect< Route > selectionStrategy;		// selection strategy - applied at each iteration for selecting parent individuals
-//!		eoSelectNumber< Route > eaSelect( selectionStrategy, POP_SIZE ); // selection object - POP_SIZE individuals are selected at each iteration
-//!
    -//!
      -//!
    • transformation operators - we have to integrate the crossover and the mutation functors into an object which may be passed -//! as a parameter when creating the peoEA object. The constructor of peoEA requires a peoTransform derived -//! object. Associated probabilities have to be specified also. -//!
      • -//!
    -//! 
    -//!		// transform operator - includes the crossover and the mutation operators with a specified associated rate
-//!		eoSGATransform< Route > transform( crossover, CROSS_RATE, mutation, MUT_RATE );
-//!		peoSeqTransform< Route > eaTransform( transform );	// ParadisEO transform operator (please remark the peo prefix) - wraps an e EO transform object
-//!
    -//!
      -//!
    • replacement strategy - required for defining the way for integrating the resulting offsprings into the initial population. -//! At your option whether you would like to chose one of the predefined replacement strategies that come with the EO framework -//! or if you want to define your own. -//!
      • -//!
    -//! 
    -//!		eoPlusReplacement< Route > eaReplace;			// replacement strategy - for replacing the initial population with offspring individuals
-//!
    -//!
    6. -//!
  6. evolutionary algorithm - having defined all the previous components, we are ready for instanciating an evolutionary algorithm. -//! In the end we have to associate a population with the algorithm, which will serve as the initial population, to be iteratively evolved. -//! -//! 
    -//!		peoEA< Route > eaAlg( eaCheckpointContinue, eaPopEval, eaSelect, eaTransform, eaReplace );
-//!
-//!		eaAlg( population );	// specifying the initial population for the algorithm, to be iteratively evolved
-//!
    -//!
    7. -//!
-//! -//! If you have not missed any of the enumerated points, your program should be like the following: -//! -//! 
-//! ##include "route.h"
-//! ##include "route_init.h"
-//! ##include "route_eval.h"
-//! 
-//! ##include "order_xover.h"
-//! ##include "city_swap.h"
-//! 
-//! ##include "param.h"
-//! 
-//! ##include 
-//! 
-//! 
-//! ##define POP_SIZE 10
-//! ##define NUM_GEN 100
-//! ##define CROSS_RATE 1.0
-//! ##define MUT_RATE 0.01
-//! 
-//! 
-//! int main( int __argc, char** __argv ) {
-//! 
-//! 	// initializing the ParadisEO-PEO environment
-//! 	peo :: init( __argc, __argv );
-//! 
-//! 
-//! 	// processing the command line specified parameters
-//! 	loadParameters( __argc, __argv );
-//! 
-//! 
-//! 	// init, eval operators, EA operators -------------------------------------------------------------------------------------------------------------
-//! 
-//! 	RouteInit route_init;	// random init object - creates random Route objects
-//! 	RouteEval full_eval;	// evaluator object - offers a fitness value for a specified Route object
-//! 
-//! 	OrderXover crossover;	// crossover operator - creates two offsprings out of two specified parents
-//! 	CitySwap mutation;	// mutation operator - randomly mutates one gene for a specified individual
-//! 	// ------------------------------------------------------------------------------------------------------------------------------------------------
-//! 
-//! 
-//! 	// evolutionary algorithm components --------------------------------------------------------------------------------------------------------------
-//! 
-//! 	eoPop< Route > population( POP_SIZE, route_init );	// initial population for the algorithm having POP_SIZE individuals
-//! 	peoSeqPopEval< Route > eaPopEval( full_eval );		// evaluator object - to be applied at each iteration on the entire population
-//! 
-//! 	eoGenContinue< Route > eaCont( NUM_GEN );		// continuation criterion - the algorithm will iterate for NUM_GEN generations
-//! 	eoCheckPoint< Route > eaCheckpointContinue( eaCont );	// checkpoint object - verify at each iteration if the continuation criterion is met
-//! 
-//! 	eoRankingSelect< Route > selectionStrategy;		// selection strategy - applied at each iteration for selecting parent individuals
-//! 	eoSelectNumber< Route > eaSelect( selectionStrategy, POP_SIZE ); // selection object - POP_SIZE individuals are selected at each iteration
-//! 
-//! 	// transform operator - includes the crossover and the mutation operators with a specified associated rate
-//! 	eoSGATransform< Route > transform( crossover, CROSS_RATE, mutation, MUT_RATE );
-//! 	peoSeqTransform< Route > eaTransform( transform );	// ParadisEO transform operator (please remark the peo prefix) - wraps an e EO transform object
-//! 
-//! 	eoPlusReplacement< Route > eaReplace;			// replacement strategy - for replacing the initial population with offspring individuals
-//! 	// ------------------------------------------------------------------------------------------------------------------------------------------------
-//! 
-//! 
-//! 	// ParadisEO-PEO evolutionary algorithm -----------------------------------------------------------------------------------------------------------
-//! 
-//! 	peoEA< Route > eaAlg( eaCheckpointContinue, eaPopEval, eaSelect, eaTransform, eaReplace );
-//! 	
-//! 	eaAlg( population );	// specifying the initial population for the algorithm, to be iteratively evolved
-//! 	// ------------------------------------------------------------------------------------------------------------------------------------------------
-//! 
-//! 
-//! 	peo :: run( );
-//! 	peo :: finalize( );
-//! 	// shutting down the ParadisEO-PEO environment
-//! 
-//! 	return 0;
-//! }
-//!
-//! -//! -//! \section testing Compilation and Execution -//! -//! First, please make sure that you followed all the previous steps in defining the evolutionary algorithm. Your file should be called main.cpp - please -//! make sure you do not rename the file (we will be using a pre-built makefile, thus you are required not to change the file names). Please make sure you -//! are in the paradiseo-peo/examples/lesson1 directory - you should open a console and you should change your current directory to the one of Lesson1. -//! -//! Compilation: being in the paradiseo-peo/examples/lesson1 directory, you have to type make. As a result the main.cpp file -//! will be compiled and you should obtain an executable file called tspExample. If you have errors, please verify any of the followings: -//! -//!
    -//!
  • you are under the right directory - you can verify by typing the pwd command - you should have something like .../paradiseo-peo/examples/lesson1
    • -//!
  • you saved your modifications in a file called main.cpp, in the paradiseo-peo/examples/lesson1 directory
    • -//!
  • there are no differences between the example presented above and your file
    • -//!
-//! -//! NOTE: in order to successfully compile your program you should already have installed an MPI distribution in your system. -//! -//! Execution: the execution of a ParadisEO-PEO program requires having already created an environment for launching MPI programs. For MPICH-2, -//! for example, this requires starting a ring of daemons. The implementation that we provided as an example is sequential and includes no parallelism - we -//! will see in the end how to include also parallelism. Executing a parallel program requires specifying a mapping of resources, in order to assing different -//! algorithms to different machines, define worker machines etc. This mapping is defined by an XML file called schema.xml, which, for our case, has -//! the following structure: -//! -//! 
-//!	
-//!	
-//!	
-//!		
-//!			
-//!			
-//!			
-//!			
-//!			1
-//!			
-//!			
-//!			
-//!			
-//!			
-//!			
-//!		
-//!	
-//!
-//! -//! Not going into details, the XML file presented above describes a mapping which includes four nodes, the first one having the role of scheduler, -//! the second one being the node on which the evolutionary algorithm is actually executed and the third and the fourth ones being slave nodes. Overall -//! the mapping says that we will be launching four processes, out of which only one will be executing the evolutionary algorithm. The other node entries -//! in the XML file have no real functionality as we have no parallelism in our program - the entries were created for you convenience, in order to provide -//! a smooth transition to creating a parallel program. -//! -//! Launching the program may be different, depending on your MPI distribution - for MPICH-2, in a console, in the paradiseo-peo/examples/lesson1 -//! directory you have to type the following command: -//! -//! mpiexec -n 4 ./tspExample @lesson.param -//! -//! NOTE: the "-n 4" indicates the number of processes to be launched. The last argument, "@lesson.param", indicates a file which specifies different -//! application specific parameters (the mapping file to be used, for example, whether to use logging or not, etc). -//! -//! The result of your execution should be similar to the following: -//! 
-//! 	Loading '../data/eil101.tsp'.
-//! 	NAME: eil101.
-//! 	COMMENT: 101-city problem (Christofides/Eilon).
-//! 	TYPE: TSP.
-//! 	DIMENSION: 101.
-//! 	EDGE_WEIGHT_TYPE: EUC_2D.
-//! 	Loading '../data/eil101.tsp'.
-//! 	NAME: eil101.
-//! 	COMMENT: 101-city problem (Christofides/Eilon).
-//! 	EOF.
-//! 	TYPE: TSP.
-//! 	DIMENSION: 101.
-//! 	EDGE_WEIGHT_TYPE: EUC_2D.
-//! 	EOF.
-//! 	Loading '../data/eil101.tsp'.
-//! 	NAME: eil101.
-//! 	COMMENT: 101-city problem (Christofides/Eilon).
-//! 	TYPE: TSP.
-//! 	DIMENSION: 101.
-//! 	EDGE_WEIGHT_TYPE: EUC_2D.
-//! 	EOF.
-//! 	Loading '../data/eil101.tsp'.
-//! 	NAME: eil101.
-//! 	COMMENT: 101-city problem (Christofides/Eilon).
-//! 	TYPE: TSP.
-//! 	DIMENSION: 101.
-//! 	EDGE_WEIGHT_TYPE: EUC_2D.
-//! 	EOF.
-//! 	STOP in eoGenContinue: Reached maximum number of generations [100/100]
-//!
-//! -//! -//! \section paraIntro Introducing parallelism -//! -//! Creating parallel programs with ParadisEO-PEO represents an easy task once you have the basic structure for your program. For experimentation, -//! in the main.cpp file, replace the line -//! 
-//!	peoSeqPopEval< Route > eaPopEval( full_eval );
-//!
-//! with -//! 
-//!	peoParaPopEval< Route > eaPopEval( full_eval );
-//!
-//! The second line only tells that we would like to evaluate individuals in parallel - this is very interesting if you have a time consuming fitness -//! evaluation function. If you take another look on the schema.xml XML file you will see the last two nodes being marked as slaves (the "num_workers" -//! attribute - these nodes will be used for computing the fitness of the individuals. -//! -//! At this point you only have to recompile your program and to launch it again - as we are not using a time consuming fitness fitness function, the -//! effects might not be visible - you may increase the number of individuals to experiment. diff --git a/trunk/paradiseo-peo/examples/lesson1/lesson.param b/trunk/paradiseo-peo/examples/lesson1/lesson.param deleted file mode 100644 index 3caca8ccf..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/lesson.param +++ /dev/null @@ -1,12 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=schema.xml - -## parameters - ---inst=../data/eil101.tsp - diff --git a/trunk/paradiseo-peo/examples/lesson1/main.cpp b/trunk/paradiseo-peo/examples/lesson1/main.cpp deleted file mode 100644 index 0658fa813..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/main.cpp +++ /dev/null @@ -1,79 +0,0 @@ -// "main.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "route.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "city_swap.h" - -#include "param.h" - -#include - - -#define POP_SIZE 10 -#define NUM_GEN 100 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 - - -int main( int __argc, char** __argv ) { - - // initializing the ParadisEO-PEO environment - peo :: init( __argc, __argv ); - - - // processing the command line specified parameters - loadParameters( __argc, __argv ); - - - // init, eval operators, EA operators ------------------------------------------------------------------------------------------------------------- - - RouteInit route_init; // random init object - creates random Route objects - RouteEval full_eval; // evaluator object - offers a fitness value for a specified Route object - - OrderXover crossover; // crossover operator - creates two offsprings out of two specified parents - CitySwap mutation; // mutation operator - randomly mutates one gene for a specified individual - // ------------------------------------------------------------------------------------------------------------------------------------------------ - - - // evolutionary algorithm components -------------------------------------------------------------------------------------------------------------- - - eoPop< Route > population( POP_SIZE, route_init ); // initial population for the algorithm having POP_SIZE individuals - peoSeqPopEval< Route > eaPopEval( full_eval ); // evaluator object - to be applied at each iteration on the entire population - - eoGenContinue< Route > eaCont( NUM_GEN ); // continuation criterion - the algorithm will iterate for NUM_GEN generations - eoCheckPoint< Route > eaCheckpointContinue( eaCont ); // checkpoint object - verify at each iteration if the continuation criterion is met - - eoRankingSelect< Route > selectionStrategy; // selection strategy - applied at each iteration for selecting parent individuals - eoSelectNumber< Route > eaSelect( selectionStrategy, POP_SIZE ); // selection object - POP_SIZE individuals are selected at each iteration - - // transform operator - includes the crossover and the mutation operators with a specified associated rate - eoSGATransform< Route > transform( crossover, CROSS_RATE, mutation, MUT_RATE ); - peoSeqTransform< Route > eaTransform( transform ); // ParadisEO transform operator (please remark the peo prefix) - wraps an e EO transform object - - eoPlusReplacement< Route > eaReplace; // replacement strategy - for replacing the initial population with offspring individuals - // ------------------------------------------------------------------------------------------------------------------------------------------------ - - - // ParadisEO-PEO evolutionary algorithm ----------------------------------------------------------------------------------------------------------- - - peoEA< Route > eaAlg( eaCheckpointContinue, eaPopEval, eaSelect, eaTransform, eaReplace ); - - eaAlg( population ); // specifying the initial population for the algorithm, to be iteratively evolved - // ------------------------------------------------------------------------------------------------------------------------------------------------ - - - peo :: run( ); - peo :: finalize( ); - // shutting down the ParadisEO-PEO environment - - return 0; -} diff --git a/trunk/paradiseo-peo/examples/lesson1/paradiseo-peo-lsn.doxyfile b/trunk/paradiseo-peo/examples/lesson1/paradiseo-peo-lsn.doxyfile deleted file mode 100644 index 9f9d15d8f..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/paradiseo-peo-lsn.doxyfile +++ /dev/null @@ -1,241 +0,0 @@ -# Doxyfile 1.4.7 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "ParadisEO-PEO Lesson1" -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = ../../docs/html/lesson1 -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.cpp \ - *.h \ - NEWS \ - README -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = ../../docs/images -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 3 -IGNORE_PREFIX = peo -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = ../../../paradiseo-mo/docs/eo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../../paradiseo-mo/docs/mo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../docs/paradiseo-peo.doxytag=../../ \ - ../shared/paradiseo-peo-lsn-shared.doxytag=../../lsnshared/html -GENERATE_TAGFILE = ../../docs/paradiseo-peo-lsn.doxytag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff --git a/trunk/paradiseo-peo/examples/lesson1/schema.xml b/trunk/paradiseo-peo/examples/lesson1/schema.xml deleted file mode 100644 index 3edea1488..000000000 --- a/trunk/paradiseo-peo/examples/lesson1/schema.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - 1 - - - - - - - - - diff --git a/trunk/paradiseo-peo/examples/lesson2/Makefile.am b/trunk/paradiseo-peo/examples/lesson2/Makefile.am deleted file mode 100755 index 30ebecce1..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -EXTRA_DIST = paradiseo-peo-lns.doxyfile foot.html - -CXX=mpicxx - -INCLUDES = \ - -I$(EO_DIR)/src/ \ - -I$(MO_DIR)/src/ \ - -I../../src/ \ - -I../shared/ - -AM_CXXFLAGS = \ - -Wall -g - -bin_PROGRAMS = \ - tspExample - -tspExample_SOURCES = \ - main.cpp - -tspExample_LDFLAGS = \ - -L$(EO_DIR)/src/ \ - -L$(EO_DIR)/src/utils \ - -L../../src/core \ - -L../../src/rmc/mpi/ \ - -L../shared/ \ - `xml2-config --libs` - -tspExample_LDADD = -lparadiseo -lrmc_mpi -leoutils -leo -ltsp_shared - diff --git a/trunk/paradiseo-peo/examples/lesson2/Makefile.in b/trunk/paradiseo-peo/examples/lesson2/Makefile.in deleted file mode 100644 index d1f5975a0..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/Makefile.in +++ /dev/null @@ -1,427 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -bin_PROGRAMS = tspExample$(EXEEXT) -subdir = examples/lesson2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) -PROGRAMS = $(bin_PROGRAMS) -am_tspExample_OBJECTS = main.$(OBJEXT) -tspExample_OBJECTS = $(am_tspExample_OBJECTS) -tspExample_DEPENDENCIES = -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -SOURCES = $(tspExample_SOURCES) -DIST_SOURCES = $(tspExample_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = mpicxx -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EO_DIR = @EO_DIR@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MOEO_DIR = @MOEO_DIR@ -MO_DIR = @MO_DIR@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -EXTRA_DIST = paradiseo-peo-lns.doxyfile foot.html -INCLUDES = \ - -I$(EO_DIR)/src/ \ - -I$(MO_DIR)/src/ \ - -I../../src/ \ - -I../shared/ - -AM_CXXFLAGS = \ - -Wall -g - -tspExample_SOURCES = \ - main.cpp - -tspExample_LDFLAGS = \ - -L$(EO_DIR)/src/ \ - -L$(EO_DIR)/src/utils \ - -L../../src/ \ - -L../../src/rmc/mpi/ \ - -L../shared/ \ - `xml2-config --libs` - -tspExample_LDADD = -lparadiseo -lrmc_mpi -leoutils -leo -ltsp_shared -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/lesson2/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/lesson2/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) -tspExample$(EXEEXT): $(tspExample_OBJECTS) $(tspExample_DEPENDENCIES) - @rm -f tspExample$(EXEEXT) - $(CXXLINK) $(tspExample_LDFLAGS) $(tspExample_OBJECTS) $(tspExample_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(bindir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-binPROGRAMS clean-generic mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-binPROGRAMS - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-binPROGRAMS uninstall-info-am - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-info-am - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/trunk/paradiseo-peo/examples/lesson2/lesson.param b/trunk/paradiseo-peo/examples/lesson2/lesson.param deleted file mode 100644 index 3caca8ccf..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/lesson.param +++ /dev/null @@ -1,12 +0,0 @@ -## miscallenous parameters - ---debug=false - -## deployment schema - ---schema=schema.xml - -## parameters - ---inst=../data/eil101.tsp - diff --git a/trunk/paradiseo-peo/examples/lesson2/main.cpp b/trunk/paradiseo-peo/examples/lesson2/main.cpp deleted file mode 100644 index 9b2c43538..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/main.cpp +++ /dev/null @@ -1,162 +0,0 @@ -// "main_ga.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "param.h" -#include "route_init.h" -#include "route_eval.h" - -#include "order_xover.h" -#include "edge_xover.h" -#include "partial_mapped_xover.h" -#include "city_swap.h" -#include "part_route_eval.h" -#include "merge_route_eval.h" -#include "two_opt_init.h" -#include "two_opt_next.h" -#include "two_opt_incr_eval.h" - -#include - -#define POP_SIZE 10 -#define NUM_GEN 100 -#define CROSS_RATE 1.0 -#define MUT_RATE 0.01 -#define NUM_PART_EVALS 2 - -#define MIG_FREQ 10 -#define MIG_SIZE 10 -#define HYBRID_SIZE 3 - -int main (int __argc, char * * __argv) { - - peo :: init (__argc, __argv); - - loadParameters (__argc, __argv); /* Processing some parameters relative to the tackled - problem (TSP) */ - - RouteInit route_init; /* Its builds random routes */ - RouteEval full_eval; /* Full route evaluator */ - - MergeRouteEval merge_eval; - - std :: vector *> part_eval; - for (unsigned i = 1 ; i <= NUM_PART_EVALS ; i ++) - part_eval.push_back (new PartRouteEval ((float) (i - 1) / NUM_PART_EVALS, (float) i / NUM_PART_EVALS)); - - OrderXover order_cross; /* Recombination */ - PartialMappedXover pm_cross; - EdgeXover edge_cross; - CitySwap city_swap_mut; /* Mutation */ - - RingTopology topo; - - /** The first EA **/ - - eoPop ox_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue ox_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint ox_checkpoint (ox_cont); /* Checkpoint */ - peoParaPopEval ox_pop_eval (part_eval, merge_eval); - eoStochTournamentSelect ox_select_one; - eoSelectNumber ox_select (ox_select_one, POP_SIZE); - eoSGATransform ox_transform (order_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform ox_para_transform (ox_transform); - eoEPReplacement ox_replace (2); - - /* The migration policy */ - eoPeriodicContinue ox_mig_cont (MIG_FREQ); /* Migration occurs periodically */ - eoRandomSelect ox_mig_select_one; /* Emigrants are randomly selected */ - eoSelectNumber ox_mig_select (ox_mig_select_one, MIG_SIZE); - eoPlusReplacement ox_mig_replace; /* Immigrants replace the worse individuals */ - - peoAsyncIslandMig ox_mig (ox_mig_cont, ox_mig_select, ox_mig_replace, topo, ox_pop, ox_pop); - //peoSyncIslandMig ox_mig (MIG_FREQ, ox_mig_select, ox_mig_replace, topo, ox_pop, ox_pop); - - ox_checkpoint.add (ox_mig); - - peoEA ox_ea (ox_checkpoint, ox_pop_eval, ox_select, ox_para_transform, ox_replace); - ox_mig.setOwner (ox_ea); - - ox_ea (ox_pop); /* Application to the given population */ - - /** The second EA **/ - - eoPop pmx_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue pmx_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint pmx_checkpoint (pmx_cont); /* Checkpoint */ - peoSeqPopEval pmx_pop_eval (full_eval); - eoRankingSelect pmx_select_one; - eoSelectNumber pmx_select (pmx_select_one, POP_SIZE); - eoSGATransform pmx_transform (pm_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - peoSeqTransform pmx_para_transform (pmx_transform); - eoPlusReplacement pmx_replace; - - /* The migration policy */ - eoPeriodicContinue pmx_mig_cont (MIG_FREQ); /* Migration occurs periodically */ - eoRandomSelect pmx_mig_select_one; /* Emigrants are randomly selected */ - eoSelectNumber pmx_mig_select (pmx_mig_select_one, MIG_SIZE); - eoPlusReplacement pmx_mig_replace; /* Immigrants replace the worse individuals */ - peoAsyncIslandMig pmx_mig (pmx_mig_cont, pmx_mig_select, pmx_mig_replace, topo, pmx_pop, pmx_pop); - //peoSyncIslandMig pmx_mig (MIG_FREQ, pmx_mig_select, pmx_mig_replace, topo, pmx_pop, pmx_pop); - pmx_checkpoint.add (pmx_mig); - - /* Hybridization with a Local Search */ - TwoOptInit pmx_two_opt_init; - TwoOptNext pmx_two_opt_next; - TwoOptIncrEval pmx_two_opt_incr_eval; - moBestImprSelect pmx_two_opt_move_select; - moHC hc (pmx_two_opt_init, pmx_two_opt_next, pmx_two_opt_incr_eval, pmx_two_opt_move_select, full_eval); - - eoPeriodicContinue pmx_ls_cont (MIG_FREQ); /* Hybridization occurs periodically */ - eoRandomSelect pmx_ls_select_one; /* ? */ - eoSelectNumber pmx_ls_select (pmx_ls_select_one, HYBRID_SIZE); - eoPlusReplacement pmx_ls_replace; - - peoSyncMultiStart pmx_ls (pmx_ls_cont, pmx_ls_select, pmx_ls_replace, hc, pmx_pop); - pmx_checkpoint.add (pmx_ls); - - peoEA pmx_ea (pmx_checkpoint, pmx_pop_eval, pmx_select, pmx_para_transform, pmx_replace); - pmx_mig.setOwner (pmx_ea); - pmx_ls.setOwner (pmx_ea); - - pmx_ea (pmx_pop); /* Application to the given population */ - - /** The third EA **/ - - eoPop edge_pop (POP_SIZE, route_init); /* Population */ - - eoGenContinue edge_cont (NUM_GEN); /* A fixed number of iterations */ - eoCheckPoint edge_checkpoint (edge_cont); /* Checkpoint */ - peoSeqPopEval edge_pop_eval (full_eval); - eoRankingSelect edge_select_one; - eoSelectNumber edge_select (edge_select_one, POP_SIZE); - peoParaSGATransform edge_para_transform (edge_cross, CROSS_RATE, city_swap_mut, MUT_RATE); - eoPlusReplacement edge_replace; - - /* The migration policy */ - eoPeriodicContinue edge_mig_cont (MIG_FREQ); /* Migration occurs periodically */ - eoRandomSelect edge_mig_select_one; /* Emigrants are randomly selected */ - eoSelectNumber edge_mig_select (edge_mig_select_one, MIG_SIZE); - eoPlusReplacement edge_mig_replace; /* Immigrants replace the worse individuals */ - peoAsyncIslandMig edge_mig (edge_mig_cont, edge_mig_select, edge_mig_replace, topo, edge_pop, edge_pop); - //peoSyncIslandMig edge_mig (MIG_FREQ, edge_mig_select, edge_mig_replace, topo, edge_pop, edge_pop); - edge_checkpoint.add (edge_mig); - - peoEA edge_ea (edge_checkpoint, edge_pop_eval, edge_select, edge_para_transform, edge_replace); - - edge_mig.setOwner (edge_ea); - - edge_ea (edge_pop); /* Application to the given population */ - - peo :: run (); - - peo :: finalize (); /* Termination */ - - return 0; -} diff --git a/trunk/paradiseo-peo/examples/lesson2/paradiseo-peo-lsn.doxyfile b/trunk/paradiseo-peo/examples/lesson2/paradiseo-peo-lsn.doxyfile deleted file mode 100644 index 2fe39e4c8..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/paradiseo-peo-lsn.doxyfile +++ /dev/null @@ -1,241 +0,0 @@ -# Doxyfile 1.4.7 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "ParadisEO-PEO Lesson2" -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = ../../docs/html/lesson2 -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.cpp \ - *.h \ - NEWS \ - README -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = ../../docs/images -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 3 -IGNORE_PREFIX = peo -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = ../../../paradiseo-mo/docs/eo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../../paradiseo-mo/docs/mo.doxytag=../../../../../paradiseo-mo/docs/html \ - ../../docs/paradiseo-peo.doxytag=../../ \ - ../shared/paradiseo-peo-lsn-shared.doxytag=../../lsnshared/html -GENERATE_TAGFILE = ../../docs/paradiseo-peo-lsn.doxytag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff --git a/trunk/paradiseo-peo/examples/lesson2/schema.xml b/trunk/paradiseo-peo/examples/lesson2/schema.xml deleted file mode 100644 index 3edea1488..000000000 --- a/trunk/paradiseo-peo/examples/lesson2/schema.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - 1 - - - - - - - - - diff --git a/trunk/paradiseo-peo/examples/shared/Makefile.am b/trunk/paradiseo-peo/examples/shared/Makefile.am deleted file mode 100644 index eb7c8cf45..000000000 --- a/trunk/paradiseo-peo/examples/shared/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -CXX=mpicxx - -INCLUDES = \ - -I$(EO_DIR)/src/ \ - -I$(MO_DIR)/src/ \ - -I$(MOEO_DIR)/src/ \ - -I../../src/ - -AM_CXXFLAGS = \ - -Wall -g - -lib_LIBRARIES = \ - libtsp_shared.a - -libtsp_shared_a_SOURCES = \ - data.h \ - data.cpp \ - opt_route.h \ - opt_route.cpp \ - param.h \ - param.cpp \ - node.h \ - node.cpp \ - route.h \ - route.cpp \ - route_init.h \ - route_init.cpp \ - route_eval.h \ - route_eval.cpp \ - two_opt.h \ - two_opt.cpp \ - two_opt_init.h \ - two_opt_init.cpp \ - two_opt_incr_eval.h \ - two_opt_incr_eval.cpp \ - two_opt_next.h \ - two_opt_next.cpp \ - order_xover.h \ - order_xover.cpp \ - partial_mapped_xover.h \ - partial_mapped_xover.cpp \ - edge_xover.h \ - edge_xover.cpp \ - city_swap.h \ - city_swap.cpp \ - part_route_eval.h \ - part_route_eval.cpp \ - merge_route_eval.h \ - merge_route_eval.cpp diff --git a/trunk/paradiseo-peo/examples/shared/Makefile.in b/trunk/paradiseo-peo/examples/shared/Makefile.in deleted file mode 100644 index 3a441bf88..000000000 --- a/trunk/paradiseo-peo/examples/shared/Makefile.in +++ /dev/null @@ -1,495 +0,0 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -subdir = examples/shared -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ - $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -am__installdirs = "$(DESTDIR)$(libdir)" -libLIBRARIES_INSTALL = $(INSTALL_DATA) -LIBRARIES = $(lib_LIBRARIES) -AR = ar -ARFLAGS = cru -libtsp_shared_a_AR = $(AR) $(ARFLAGS) -libtsp_shared_a_LIBADD = -am_libtsp_shared_a_OBJECTS = data.$(OBJEXT) opt_route.$(OBJEXT) \ - param.$(OBJEXT) node.$(OBJEXT) route.$(OBJEXT) \ - route_init.$(OBJEXT) route_eval.$(OBJEXT) two_opt.$(OBJEXT) \ - two_opt_init.$(OBJEXT) two_opt_incr_eval.$(OBJEXT) \ - two_opt_next.$(OBJEXT) order_xover.$(OBJEXT) \ - partial_mapped_xover.$(OBJEXT) edge_xover.$(OBJEXT) \ - city_swap.$(OBJEXT) part_route_eval.$(OBJEXT) \ - merge_route_eval.$(OBJEXT) -libtsp_shared_a_OBJECTS = $(am_libtsp_shared_a_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -depcomp = $(SHELL) $(top_srcdir)/depcomp -am__depfiles_maybe = depfiles -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ - -o $@ -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(libtsp_shared_a_SOURCES) -DIST_SOURCES = $(libtsp_shared_a_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ -AMTAR = @AMTAR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = mpicxx -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EO_DIR = @EO_DIR@ -EXEEXT = @EXEEXT@ -GREP = @GREP@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LTLIBOBJS = @LTLIBOBJS@ -MAKEINFO = @MAKEINFO@ -MOEO_DIR = @MOEO_DIR@ -MO_DIR = @MO_DIR@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build_alias = @build_alias@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host_alias = @host_alias@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -INCLUDES = \ - -I$(EO_DIR)/src/ \ - -I$(MO_DIR)/src/ \ - -I$(MOEO_DIR)/src/ \ - -I../../src/ - -AM_CXXFLAGS = \ - -Wall -g - -lib_LIBRARIES = \ - libtsp_shared.a - -libtsp_shared_a_SOURCES = \ - data.h \ - data.cpp \ - opt_route.h \ - opt_route.cpp \ - param.h \ - param.cpp \ - node.h \ - node.cpp \ - route.h \ - route.cpp \ - route_init.h \ - route_init.cpp \ - route_eval.h \ - route_eval.cpp \ - two_opt.h \ - two_opt.cpp \ - two_opt_init.h \ - two_opt_init.cpp \ - two_opt_incr_eval.h \ - two_opt_incr_eval.cpp \ - two_opt_next.h \ - two_opt_next.cpp \ - order_xover.h \ - order_xover.cpp \ - partial_mapped_xover.h \ - partial_mapped_xover.cpp \ - edge_xover.h \ - edge_xover.cpp \ - city_swap.h \ - city_swap.cpp \ - part_route_eval.h \ - part_route_eval.cpp \ - merge_route_eval.h \ - merge_route_eval.cpp - -all: all-am - -.SUFFIXES: -.SUFFIXES: .cpp .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ - && exit 0; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu examples/shared/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu examples/shared/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - f=$(am__strip_dir) \ - echo " $(libLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(libLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - p=$(am__strip_dir) \ - echo " $(RANLIB) '$(DESTDIR)$(libdir)/$$p'"; \ - $(RANLIB) "$(DESTDIR)$(libdir)/$$p"; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - p=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - rm -f "$(DESTDIR)$(libdir)/$$p"; \ - done - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) -libtsp_shared.a: $(libtsp_shared_a_OBJECTS) $(libtsp_shared_a_DEPENDENCIES) - -rm -f libtsp_shared.a - $(libtsp_shared_a_AR) libtsp_shared.a $(libtsp_shared_a_OBJECTS) $(libtsp_shared_a_LIBADD) - $(RANLIB) libtsp_shared.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/city_swap.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge_xover.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/merge_route_eval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opt_route.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/order_xover.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/param.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/part_route_eval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/partial_mapped_xover.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route_eval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/two_opt.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/two_opt_incr_eval.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/two_opt_init.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/two_opt_next.Po@am__quote@ - -.cpp.o: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $< - -.cpp.obj: -@am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` -uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ - if test -d $$d/$$file; then \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ - fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ - else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(LIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(libdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -info: info-am - -info-am: - -install-data-am: - -install-exec-am: install-libLIBRARIES - -install-info: install-info-am - -install-man: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-info-am uninstall-libLIBRARIES - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-libLIBRARIES install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-info-am uninstall-libLIBRARIES - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/trunk/paradiseo-peo/examples/shared/city_swap.cpp b/trunk/paradiseo-peo/examples/shared/city_swap.cpp deleted file mode 100644 index cf5afae8a..000000000 --- a/trunk/paradiseo-peo/examples/shared/city_swap.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// "city_swap.cpp" - -// (c) OPAC Team, LIFL, 2002 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include "city_swap.h" - -bool CitySwap :: operator () (Route & __route) { - - std :: swap (__route [rng.random (__route.size ())], - __route [rng.random (__route.size ())]) ; - - __route.invalidate () ; - - return true ; -} diff --git a/trunk/paradiseo-peo/examples/shared/city_swap.h b/trunk/paradiseo-peo/examples/shared/city_swap.h deleted file mode 100644 index cd7a6aaaf..000000000 --- a/trunk/paradiseo-peo/examples/shared/city_swap.h +++ /dev/null @@ -1,26 +0,0 @@ -// "city_swap.h" - -// (c) OPAC Team, LIFL, 2002 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef city_swap_h -#define city_swap_h - -#include - -#include "route.h" - -/** Its swaps two vertices - randomly choosen */ -class CitySwap : public eoMonOp { - -public : - - bool operator () (Route & __route) ; - -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/data.cpp b/trunk/paradiseo-peo/examples/shared/data.cpp deleted file mode 100644 index 415c30aa1..000000000 --- a/trunk/paradiseo-peo/examples/shared/data.cpp +++ /dev/null @@ -1,98 +0,0 @@ -// "data.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include -#include -#include -#include - -#include - -#include "data.h" -#include "node.h" - -#define MAX_TRASH_LENGTH 1000 -#define MAX_FIELD_LENGTH 1000 -#define MAX_LINE_LENGTH 1000 - -static void getNextField (FILE * __f, char * __buff) { - - char trash [MAX_TRASH_LENGTH]; - - fscanf (__f, "%[ \t:\n]", trash); /* Discarding sep. */ - fscanf (__f, "%[^:\n]", __buff); /* Reading the field */ - fgetc (__f); -} - -static void getLine (FILE * __f, char * __buff) { - - char trash [MAX_TRASH_LENGTH]; - - fscanf (__f, "%[ \t:\n]", trash); /* Discarding sep. */ - fscanf (__f, "%[^\n]", __buff); /* Reading the line */ -} - -void loadData (const char * __filename) { - - FILE * f = fopen (__filename, "r"); - - if (f) { - - printf ("Loading '%s'.\n", __filename); - - char field [MAX_FIELD_LENGTH]; - - getNextField (f, field); /* Name */ - assert (strstr (field, "NAME")); - getNextField (f, field); - printf ("NAME: %s.\n", field); - - getNextField (f, field); /* Comment */ - assert (strstr (field, "COMMENT")); - getLine (f, field); - printf ("COMMENT: %s.\n", field); - - getNextField (f, field); /* Type */ - assert (strstr (field, "TYPE")); - getNextField (f, field); - printf ("TYPE: %s.\n", field); - - getNextField (f, field); /* Dimension */ - assert (strstr (field, "DIMENSION")); - getNextField (f, field); - printf ("DIMENSION: %s.\n", field); - numNodes = atoi (field); - - getNextField (f, field); /* Edge weight type */ - assert (strstr (field, "EDGE_WEIGHT_TYPE")); - getNextField (f, field); - printf ("EDGE_WEIGHT_TYPE: %s.\n", field); - - getNextField (f, field); /* Node coord section */ - assert (strstr (field, "NODE_COORD_SECTION")); - loadNodes (f); - - getNextField (f, field); /* End of file */ - assert (strstr (field, "EOF")); - printf ("EOF.\n"); - } - else { - - fprintf (stderr, "Can't open '%s'.\n", __filename); - exit (1); - } -} - -void loadData (eoParser & __parser) { - - /* Getting the path of the instance */ - - eoValueParam param ("", "inst", "Path of the instance") ; - __parser.processParam (param) ; - loadData (param.value ().c_str ()); -} diff --git a/trunk/paradiseo-peo/examples/shared/data.h b/trunk/paradiseo-peo/examples/shared/data.h deleted file mode 100644 index c00c6edfb..000000000 --- a/trunk/paradiseo-peo/examples/shared/data.h +++ /dev/null @@ -1,18 +0,0 @@ -// "data.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __data_h -#define __data_h - -#include - -extern void loadData (const char * __filename); - -extern void loadData (eoParser & __parser); - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/display.cpp b/trunk/paradiseo-peo/examples/shared/display.cpp deleted file mode 100644 index 0fbaad4b2..000000000 --- a/trunk/paradiseo-peo/examples/shared/display.cpp +++ /dev/null @@ -1,117 +0,0 @@ -// "display.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include -#include - -#include - -#include "display.h" -#include "node.h" -#include "opt_route.h" - -#define BORDER 20 -#define RATIO 0.5 - -#define screen_width 1024 -#define screen_height 768 - -static const char * filename; - -/* Computed coordinates */ -static unsigned * X_new_coord, * Y_new_coord ; - -/* this variable will contain the handle to the returned graphics context. */ -static GC gc; - -/* this variable will contain the pointer to the Display structure */ -static Display* disp; - -/* this variable will store the ID of the newly created window. */ -static Window win; - -static int screen; - -/* Create a new backing pixmap of the appropriate size */ - - /* Best tour */ - /* - gdk_gc_set_line_attributes (gc, 2, GDK_LINE_ON_OFF_DASH, GDK_CAP_NOT_LAST, GDK_JOIN_MITER) ; - - gdk_gc_set_foreground (gc, & color_green) ; - - for (int i = 0 ; i < (int) numNodes ; i ++) { - - gdk_draw_line (pixmap, gc, - X_new_coord [opt_route [i]], - Y_new_coord [opt_route [i]], - X_new_coord [opt_route [(i + 1) % numNodes]], - Y_new_coord [opt_route [(i + 1) % numNodes]]); - - }*/ - -void openMainWindow (const char * __filename) { - - filename = __filename; - - /* Map */ - int map_width = (int) (X_max - X_min); - int map_height = (int) (Y_max - Y_min); - int map_side = std :: max (map_width, map_height); - - /* Calculate the window's width and height. */ - int win_width = (int) (screen_width * RATIO * map_width / map_side); - int win_height = (int) (screen_height * RATIO * map_height / map_side); - - /* Computing the coordinates */ - X_new_coord = new unsigned [numNodes]; - Y_new_coord = new unsigned [numNodes]; - - for (unsigned i = 0; i < numNodes; i ++) { - X_new_coord [i] = (unsigned) (win_width * (1.0 - (X_coord [i] - X_min) / map_width) + BORDER); - Y_new_coord [i] = (unsigned) (win_height * (1.0 - (Y_coord [i] - Y_min) / map_height) + BORDER); - } - - /* Initialisation */ - XGCValues val ; - - disp = XOpenDisplay (NULL) ; - screen = DefaultScreen (disp) ; - win = XCreateSimpleWindow (disp, RootWindow (disp, screen), 0, 0, win_width + 2 * BORDER, win_height + 2 * BORDER, 2, BlackPixel (disp, screen), WhitePixel (disp, screen)) ; - val.foreground = BlackPixel(disp, screen) ; - val.background = WhitePixel(disp, screen) ; - gc = XCreateGC (disp, win, GCForeground | GCBackground, & val) ; - - XMapWindow (disp, win) ; - XFlush (disp) ; - - while (true) { - XClearWindow (disp, win) ; - - /* Vertices as circles */ - for (unsigned i = 1 ; i < numNodes ; i ++) - XDrawArc (disp, win, gc, X_new_coord [i] - 1, Y_new_coord [i] - 1, 3, 3, 0, 364 * 64) ; - - /* New tour */ - std :: ifstream f (filename); - if (f) { - Route route; - f >> route; - f.close (); - - for (int i = 0; i < (int) numNodes; i ++) - XDrawLine (disp, win, gc, - X_new_coord [route [i]], - Y_new_coord [route [i]], - X_new_coord [route [(i + 1) % numNodes]], - Y_new_coord [route [(i + 1) % numNodes]]); - } - XFlush (disp) ; - sleep (1) ; - } -} diff --git a/trunk/paradiseo-peo/examples/shared/display.h b/trunk/paradiseo-peo/examples/shared/display.h deleted file mode 100644 index f534943d6..000000000 --- a/trunk/paradiseo-peo/examples/shared/display.h +++ /dev/null @@ -1,16 +0,0 @@ -// "display.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __display_h -#define __display_h - -#include "route.h" - -extern void openMainWindow (const char * __filename); - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/display_best_route.cpp b/trunk/paradiseo-peo/examples/shared/display_best_route.cpp deleted file mode 100644 index 14b1ba0a3..000000000 --- a/trunk/paradiseo-peo/examples/shared/display_best_route.cpp +++ /dev/null @@ -1,22 +0,0 @@ -// "display_best_route.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "display_best_route.h" -#include "display.h" - -DisplayBestRoute :: DisplayBestRoute (eoPop & __pop - ) : pop (__pop) { - - -} - -void DisplayBestRoute :: operator () () { - - displayRoute (pop.best_element ()); -} - diff --git a/trunk/paradiseo-peo/examples/shared/display_best_route.h b/trunk/paradiseo-peo/examples/shared/display_best_route.h deleted file mode 100644 index 5571c35be..000000000 --- a/trunk/paradiseo-peo/examples/shared/display_best_route.h +++ /dev/null @@ -1,32 +0,0 @@ -// "display_best_route.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __display_best_route_h -#define __display_best_route_h - -#include - -#include - -#include "route.h" - -class DisplayBestRoute : public eoUpdater { - -public : - - DisplayBestRoute (eoPop & __pop); - - void operator () (); - -private : - - eoPop & pop; - -}; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/edge_xover.cpp b/trunk/paradiseo-peo/examples/shared/edge_xover.cpp deleted file mode 100644 index 441262e26..000000000 --- a/trunk/paradiseo-peo/examples/shared/edge_xover.cpp +++ /dev/null @@ -1,118 +0,0 @@ -// "edge_xover.cpp" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include -#include - -#include - -#include "edge_xover.h" - -void EdgeXover :: build_map (const Route & __par1, const Route & __par2) { - - unsigned 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]) ; - } - - visited.clear () ; - visited.resize (len, false) ; -} - -void EdgeXover :: remove_entry (unsigned __vertex, std :: vector > & __map) { - - std :: set & neigh = __map [__vertex] ; - - for (std :: set :: iterator it = neigh.begin () ; - it != neigh.end () ; - it ++) - __map [* it].erase (__vertex) ; - -} - -void EdgeXover :: add_vertex (unsigned __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) { - - build_map (__par1, __par2) ; - - unsigned len = __par1.size () ; - - /* Go ! */ - __child.clear () ; - - unsigned cur_vertex = rng.random (len) ; - - add_vertex (cur_vertex, __child) ; - - for (unsigned i = 1 ; i < len ; i ++) { - - unsigned len_min_entry = MAXINT ; - - 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 ; - } - - 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) ; - } - - if (! cand.size ()) { - - /* Oh no ! Implicit mutation */ - for (unsigned 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) { - - // Init. copy - Route par [2] ; - par [0] = __route1 ; - par [1] = __route2 ; - - cross (par [0], par [1], __route1) ; - cross (par [1], par [0], __route2) ; - - __route1.invalidate () ; - __route2.invalidate () ; - - return true ; -} diff --git a/trunk/paradiseo-peo/examples/shared/edge_xover.h b/trunk/paradiseo-peo/examples/shared/edge_xover.h deleted file mode 100644 index e8bb1f063..000000000 --- a/trunk/paradiseo-peo/examples/shared/edge_xover.h +++ /dev/null @@ -1,43 +0,0 @@ -// "edge_xover.h" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef edge_xover_h -#define edge_xover_h - -#include -#include - -#include - -#include "route.h" - -/** Edge Crossover */ -class EdgeXover : public eoQuadOp { - -public : - - bool operator () (Route & __route1, Route & __route2) ; - -private : - - void cross (const Route & __par1, const Route & __par2, Route & __child) ; /* Binary */ - - void remove_entry (unsigned __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) ; - - std :: vector > _map ; /* The handled map */ - - std :: vector visited ; /* Vertices that are already visited */ - -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/merge_route_eval.cpp b/trunk/paradiseo-peo/examples/shared/merge_route_eval.cpp deleted file mode 100644 index 1c0d66870..000000000 --- a/trunk/paradiseo-peo/examples/shared/merge_route_eval.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// "merge_route_eval.cpp" - -// (c) OPAC Team, LIFL, 2005 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "merge_route_eval.h" - -void MergeRouteEval :: operator () (Route & __route, const int & __part_fit) { - - int len = __route.fitness (); - len += __part_fit; - __route.fitness (len); -} - diff --git a/trunk/paradiseo-peo/examples/shared/merge_route_eval.h b/trunk/paradiseo-peo/examples/shared/merge_route_eval.h deleted file mode 100644 index dd4a9534d..000000000 --- a/trunk/paradiseo-peo/examples/shared/merge_route_eval.h +++ /dev/null @@ -1,24 +0,0 @@ -// "merge_route_eval.h" - -// (c) OPAC Team, LIFL, 2005 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __merge_route_eval_h -#define __merge_route_eval_h - -#include - -#include "route.h" - -class MergeRouteEval : public peoAggEvalFunc { - -public : - - void operator () (Route & __route, const int & __part_fit) ; - -}; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/mix.h b/trunk/paradiseo-peo/examples/shared/mix.h deleted file mode 100644 index ce5d9bf9e..000000000 --- a/trunk/paradiseo-peo/examples/shared/mix.h +++ /dev/null @@ -1,25 +0,0 @@ - - -/* - file: 'mix.h' - author: S. CAHON - mail: paradiseo-help@lists.gforge.inria.fr - date: dec. 2005 -*/ - -#ifndef __mix_h -#define __mix_h - -#include - -#include - -template void mix (std :: vector & __v) { - - unsigned len = __v.size () ; - - for (unsigned i = 0 ; i < len ; i ++) - std :: swap (__v [i], __v [rng.random (len)]) ; -} - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/node.cpp b/trunk/paradiseo-peo/examples/shared/node.cpp deleted file mode 100644 index cf0c0f523..000000000 --- a/trunk/paradiseo-peo/examples/shared/node.cpp +++ /dev/null @@ -1,77 +0,0 @@ -// "node.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include -#include - -#include "node.h" - -unsigned numNodes; /* Number of nodes */ - -//static unsigned * * dist; /* Square matrix of distances */ - -double * X_coord, * Y_coord; - -double X_min = MAXDOUBLE, X_max = MINDOUBLE, Y_min = MAXDOUBLE, Y_max = MINDOUBLE; - -void loadNodes (FILE * __f) { - - /* Coord */ - - X_coord = new double [numNodes]; - - Y_coord = new double [numNodes]; - - unsigned num; - - for (unsigned i = 0; i < numNodes; i ++) { - - fscanf (__f, "%u%lf%lf", & num, X_coord + i, Y_coord + i); - - if (X_coord [i] < X_min) - X_min = X_coord [i]; - if (X_coord [i] > X_max) - X_max = X_coord [i]; - if (Y_coord [i] < Y_min) - Y_min = Y_coord [i]; - if (Y_coord [i] > Y_max) - Y_max = Y_coord [i]; - } - - /* Allocation */ - /* - dist = new unsigned * [numNodes]; - - for (unsigned i = 0; i < numNodes; i ++) - dist [i] = new unsigned [numNodes]; - */ - /* Computation of the distances */ - - /* - for (unsigned i = 0; i < numNodes; i ++) { - - dist [i] [i] = 0; - - for (unsigned j = 0; j < numNodes; j ++) { - - double dx = X_coord [i] - X_coord [j], dy = Y_coord [i] - Y_coord [j]; - - dist [i] [j] = dist [j] [i] = (unsigned) (sqrt (dx * dx + dy * dy) + 0.5) ; - } - }*/ -} - -unsigned distance (Node __from, Node __to) { - - // return dist [__from] [__to]; - - double dx = X_coord [__from] - X_coord [__to], dy = Y_coord [__from] - Y_coord [__to]; - - return (unsigned) (sqrt (dx * dx + dy * dy) + 0.5) ; -} - diff --git a/trunk/paradiseo-peo/examples/shared/node.h b/trunk/paradiseo-peo/examples/shared/node.h deleted file mode 100644 index fe735361a..000000000 --- a/trunk/paradiseo-peo/examples/shared/node.h +++ /dev/null @@ -1,26 +0,0 @@ -// "node.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __node_h -#define __node_h - -#include - -typedef unsigned Node; - -extern double X_min, X_max, Y_min, Y_max; - -extern double * X_coord, * Y_coord; - -extern unsigned numNodes; /* Number of nodes */ - -extern void loadNodes (FILE * __f); - -extern unsigned distance (Node __from, Node __to); - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/opt_route.cpp b/trunk/paradiseo-peo/examples/shared/opt_route.cpp deleted file mode 100644 index 2ee739358..000000000 --- a/trunk/paradiseo-peo/examples/shared/opt_route.cpp +++ /dev/null @@ -1,107 +0,0 @@ -// "opt_route.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "opt_route.h" - -#define MAX_TRASH_LENGTH 1000 -#define MAX_FIELD_LENGTH 1000 -#define MAX_LINE_LENGTH 1000 - -static void getNextField (FILE * __f, char * __buff) { - - char trash [MAX_TRASH_LENGTH]; - - fscanf (__f, "%[ \t:\n]", trash); /* Discarding sep. */ - fscanf (__f, "%[^:\n]", __buff); /* Reading the field */ - fgetc (__f); -} - -static void getLine (FILE * __f, char * __buff) { - - char trash [MAX_TRASH_LENGTH]; - - fscanf (__f, "%[ \t:\n]", trash); /* Discarding sep. */ - fscanf (__f, "%[^\n]", __buff); /* Reading the line */ -} - -static void loadBestRoute (FILE * __f) { - - opt_route.clear (); - - for (unsigned i = 0; i < numNodes; i ++) { - Node node; - fscanf (__f, "%u", & node); - opt_route.push_back (node - 1); - } - int d; /* -1 ! */ - fscanf (__f, "%d", & d); -} - -void loadOptimumRoute (const char * __filename) { - - FILE * f = fopen (__filename, "r"); - - if (f) { - - printf ("Loading '%s'.\n", __filename); - - char field [MAX_FIELD_LENGTH]; - - getNextField (f, field); /* Name */ - assert (strstr (field, "NAME")); - getNextField (f, field); - //printf ("NAME: %s.\n", field); - - getNextField (f, field); /* Comment */ - assert (strstr (field, "COMMENT")); - getLine (f, field); - // printf ("COMMENT: %s.\n", field); - - getNextField (f, field); /* Type */ - assert (strstr (field, "TYPE")); - getNextField (f, field); - //printf ("TYPE: %s.\n", field); - - getNextField (f, field); /* Dimension */ - assert (strstr (field, "DIMENSION")); - getNextField (f, field); - // printf ("DIMENSION: %s.\n", field); - numNodes = atoi (field); - - getNextField (f, field); /* Tour section */ - assert (strstr (field, "TOUR_SECTION")); - loadBestRoute (f); - - getNextField (f, field); /* End of file */ - assert (strstr (field, "EOF")); - //printf ("EOF.\n"); - - printf ("The length of the best route is %u.\n", length (opt_route)); - } - else { - - fprintf (stderr, "Can't open '%s'.\n", __filename); - exit (1); - } -} - -void loadOptimumRoute (eoParser & __parser) { - - /* Getting the path of the instance */ - - eoValueParam param ("", "optimumTour", "Optimum tour") ; - __parser.processParam (param) ; - if (strlen (param.value ().c_str ())) - loadOptimumRoute (param.value ().c_str ()); - else - opt_route.fitness (0); -} - -Route opt_route; /* Optimum route */ - - diff --git a/trunk/paradiseo-peo/examples/shared/opt_route.h b/trunk/paradiseo-peo/examples/shared/opt_route.h deleted file mode 100644 index 52df469de..000000000 --- a/trunk/paradiseo-peo/examples/shared/opt_route.h +++ /dev/null @@ -1,23 +0,0 @@ -// "opt_route.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __opt_route_h -#define __opt_route_h - -#include -#include - -#include "route.h" - -extern void loadOptimumRoute (const char * __filename); - -extern void loadOptimumRoute (eoParser & __parser); - -extern Route opt_route; /* Optimum route */ - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/order_xover.cpp b/trunk/paradiseo-peo/examples/shared/order_xover.cpp deleted file mode 100644 index 5f8b3ba65..000000000 --- a/trunk/paradiseo-peo/examples/shared/order_xover.cpp +++ /dev/null @@ -1,64 +0,0 @@ -// "order_xover.cpp" - -// (c) OPAC Team, LIFL, 2002 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include - -#include "order_xover.h" - -void OrderXover :: cross (const Route & __par1, const Route & __par2, Route & __child) { - - unsigned cut2 = 1 + rng.random (numNodes) ; - unsigned cut1 = rng.random (cut2); - unsigned l = 0; - - /* To store vertices that have already been crossed */ - std :: vector v (numNodes, false); - - /* Copy of the left partial route of the first parent */ - for (unsigned i = cut1 ; i < cut2 ; i ++) { - __child [l ++] = __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 < numNodes; i ++) - if (__par2 [i] == __child [cut2 - 1]) { - from = i ; - break ; - } - - /* Selecting a direction (Left or Right) */ - char direct = rng.flip () ? 1 : -1 ; - - for (unsigned i = 0; i < numNodes + 1; i ++) { - unsigned bidule = (direct * i + from + numNodes) % numNodes; - if (! v [__par2 [bidule]]) { - __child [l ++] = __par2 [bidule] ; - v [__par2 [bidule]] = true ; - } - } -} - -bool OrderXover :: operator () (Route & __route1, Route & __route2) { - - // Init. copy - Route par [2] ; - par [0] = __route1 ; - par [1] = __route2 ; - - cross (par [0], par [1], __route1) ; - cross (par [1], par [0], __route2) ; - - __route1.invalidate () ; - __route2.invalidate () ; - - return true ; -} diff --git a/trunk/paradiseo-peo/examples/shared/order_xover.h b/trunk/paradiseo-peo/examples/shared/order_xover.h deleted file mode 100644 index 9fc1907d8..000000000 --- a/trunk/paradiseo-peo/examples/shared/order_xover.h +++ /dev/null @@ -1,28 +0,0 @@ -// "order_xover.h" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef order_xover_h -#define order_xover_h - -#include - -#include "route.h" - -/** Order Crossover */ -class OrderXover : public eoQuadOp { - -public : - - bool operator () (Route & __route1, Route & __route2) ; - -private : - - void cross (const Route & __par1, const Route & __par2, Route & __child) ; -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/paradiseo-peo-lsn-shared.doxyfile b/trunk/paradiseo-peo/examples/shared/paradiseo-peo-lsn-shared.doxyfile deleted file mode 100644 index bd1a827a9..000000000 --- a/trunk/paradiseo-peo/examples/shared/paradiseo-peo-lsn-shared.doxyfile +++ /dev/null @@ -1,240 +0,0 @@ -# Doxyfile 1.4.7 - -#--------------------------------------------------------------------------- -# Project related configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "ParadisEO-PEO - Lessons" -PROJECT_NUMBER = 0.1 -OUTPUT_DIRECTORY = ../../docs/html/lsnshared -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English -USE_WINDOWS_ENCODING = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = YES -ABBREVIATE_BRIEF = "The $name class" \ - "The $name widget" \ - "The $name file" \ - is \ - provides \ - specifies \ - contains \ - represents \ - a \ - an \ - the -ALWAYS_DETAILED_SEC = NO -INLINE_INHERITED_MEMB = NO -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -STRIP_FROM_INC_PATH = -SHORT_NAMES = NO -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -SEPARATE_MEMBER_PAGES = NO -TAB_SIZE = 8 -ALIASES = -OPTIMIZE_OUTPUT_FOR_C = NO -OPTIMIZE_OUTPUT_JAVA = NO -BUILTIN_STL_SUPPORT = NO -DISTRIBUTE_GROUP_DOC = NO -SUBGROUPING = YES -#--------------------------------------------------------------------------- -# Build related configuration options -#--------------------------------------------------------------------------- -EXTRACT_ALL = NO -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -EXTRACT_LOCAL_METHODS = NO -HIDE_UNDOC_MEMBERS = YES -HIDE_UNDOC_CLASSES = YES -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -INTERNAL_DOCS = NO -CASE_SENSE_NAMES = YES -HIDE_SCOPE_NAMES = NO -SHOW_INCLUDE_FILES = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -SORT_BRIEF_DOCS = NO -SORT_BY_SCOPE_NAME = NO -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 30 -SHOW_USED_FILES = YES -SHOW_DIRECTORIES = NO -FILE_VERSION_FILTER = -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = YES -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_IF_DOC_ERROR = YES -WARN_NO_PARAMDOC = NO -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = . -FILE_PATTERNS = *.cpp \ - *.h \ - NEWS \ - README -RECURSIVE = YES -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = * -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = -INPUT_FILTER = -FILTER_PATTERNS = -FILTER_SOURCE_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = YES -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = YES -REFERENCES_RELATION = YES -REFERENCES_LINK_SOURCE = YES -USE_HTAGS = NO -VERBATIM_HEADERS = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = YES -COLS_IN_ALPHA_INDEX = 3 -IGNORE_PREFIX = peo -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = html -HTML_FILE_EXTENSION = .html -HTML_HEADER = -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = NO -TOC_EXPAND = NO -DISABLE_INDEX = NO -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = YES -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = YES -USE_PDFLATEX = YES -LATEX_BATCHMODE = NO -LATEX_HIDE_INDICES = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = YES -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = -XML_PROGRAMLISTING = YES -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = NO -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to external references -#--------------------------------------------------------------------------- -TAGFILES = ../../../paradiseo-mo/docs/eo.doxytag=../../../../paradiseo-mo/docs/html \ - ../../../paradiseo-mo/docs/mo.doxytag=../../../../paradiseo-mo/docs/html \ - ../../docs/paradiseo-peo.doxytag=../../ -GENERATE_TAGFILE = ../../docs/paradiseo-peo-lsn-shared.doxytag -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = YES -HAVE_DOT = NO -CLASS_GRAPH = YES -COLLABORATION_GRAPH = YES -GROUP_GRAPHS = YES -UML_LOOK = NO -TEMPLATE_RELATIONS = NO -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = YES -CALL_GRAPH = NO -CALLER_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DIRECTORY_GRAPH = YES -DOT_IMAGE_FORMAT = png -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 -MAX_DOT_GRAPH_DEPTH = 0 -DOT_TRANSPARENT = NO -DOT_MULTI_TARGETS = NO -GENERATE_LEGEND = YES -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::additions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = YES diff --git a/trunk/paradiseo-peo/examples/shared/param.cpp b/trunk/paradiseo-peo/examples/shared/param.cpp deleted file mode 100644 index ba41c71d3..000000000 --- a/trunk/paradiseo-peo/examples/shared/param.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// "param.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include "data.h" -#include "opt_route.h" - -void loadParameters (int __argc, char * * __argv) { - - eoParser parser (__argc, __argv); - - loadData (parser); - - loadOptimumRoute (parser); -} - - diff --git a/trunk/paradiseo-peo/examples/shared/param.h b/trunk/paradiseo-peo/examples/shared/param.h deleted file mode 100644 index ee21bf4d8..000000000 --- a/trunk/paradiseo-peo/examples/shared/param.h +++ /dev/null @@ -1,14 +0,0 @@ -// "param.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __param_h -#define __param_h - -extern void loadParameters (int __argc, char * * __argv); - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/part_route_eval.cpp b/trunk/paradiseo-peo/examples/shared/part_route_eval.cpp deleted file mode 100644 index e2d362230..000000000 --- a/trunk/paradiseo-peo/examples/shared/part_route_eval.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// "part_route_eval.cpp" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "part_route_eval.h" -#include "node.h" - -PartRouteEval :: PartRouteEval (float __from, - float __to - ) : from (__from), - to (__to) { - -} - -void PartRouteEval :: operator () (Route & __route) { - - - unsigned len = 0 ; - - for (unsigned i = (unsigned) (__route.size () * from) ; - i < (unsigned) (__route.size () * to) ; - i ++) - len += distance (__route [i], __route [(i + 1) % numNodes]) ; - - __route.fitness (- (int) len) ; -} diff --git a/trunk/paradiseo-peo/examples/shared/part_route_eval.h b/trunk/paradiseo-peo/examples/shared/part_route_eval.h deleted file mode 100644 index 891737760..000000000 --- a/trunk/paradiseo-peo/examples/shared/part_route_eval.h +++ /dev/null @@ -1,33 +0,0 @@ -// "part_route_eval.h" - -// (c) OPAC Team, LIFL, 2005 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __part_route_eval_h -#define __part_route_eval_h - -#include - -#include "route.h" - -/** Route Evaluator */ -class PartRouteEval : public eoEvalFunc { - -public : - - /** Constructor */ - PartRouteEval (float __from, float __to) ; - - void operator () (Route & __route) ; - -private : - - float from, to ; - -} ; - - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.cpp b/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.cpp deleted file mode 100644 index 1ad819a2d..000000000 --- a/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.cpp +++ /dev/null @@ -1,61 +0,0 @@ -// "partial_mapped_xover.cpp" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include - -#include "partial_mapped_xover.h" -#include "mix.h" - -void PartialMappedXover :: repair (Route & __route, unsigned __cut1, unsigned __cut2) { - - unsigned v [__route.size ()] ; // Number of times a cities are visited ... - - for (unsigned i = 0 ; i < __route.size () ; i ++) - v [i] = 0 ; - - for (unsigned i = 0 ; i < __route.size () ; i ++) - v [__route [i]] ++ ; - - std :: vector vert ; - - for (unsigned i = 0 ; i < __route.size () ; i ++) - if (! v [i]) - vert.push_back (i) ; - - mix (vert) ; - - for (unsigned i = 0 ; i < __route.size () ; i ++) - if (i < __cut1 || i >= __cut2) - if (v [__route [i]] > 1) { - __route [i] = vert.back () ; - vert.pop_back () ; - } -} - -bool PartialMappedXover :: operator () (Route & __route1, Route & __route2) { - - unsigned cut1 = rng.random (__route1.size ()), cut2 = rng.random (__route2.size ()) ; - - if (cut2 < cut1) - std :: swap (cut1, cut2) ; - - // Between the cuts - for (unsigned i = cut1 ; i < cut2 ; i ++) - std :: swap (__route1 [i], __route2 [i]) ; - - // Outside the cuts - repair (__route1, cut1, cut2) ; - repair (__route2, cut1, cut2) ; - - __route1.invalidate () ; - __route2.invalidate () ; - - return true ; -} diff --git a/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.h b/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.h deleted file mode 100644 index 0c08531be..000000000 --- a/trunk/paradiseo-peo/examples/shared/partial_mapped_xover.h +++ /dev/null @@ -1,28 +0,0 @@ -// "partial_mapped_xover.h" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef partial_mapped_xover_h -#define partial_mapped_xover_h - -#include - -#include "route.h" - -/** Partial Mapped Crossover */ -class PartialMappedXover : public eoQuadOp { - -public : - - bool operator () (Route & __route1, Route & __route2) ; - -private : - - void repair (Route & __route, unsigned __cut1, unsigned __cut2) ; -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/route.cpp b/trunk/paradiseo-peo/examples/shared/route.cpp deleted file mode 100644 index eea64ab51..000000000 --- a/trunk/paradiseo-peo/examples/shared/route.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// "route.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "route.h" - -unsigned length (const Route & __route) { - - unsigned len = 0 ; - - for (unsigned i = 0; i < numNodes; i ++) - len += distance (__route [i], __route [(i + 1) % numNodes]) ; - - return len; -} - - diff --git a/trunk/paradiseo-peo/examples/shared/route.h b/trunk/paradiseo-peo/examples/shared/route.h deleted file mode 100644 index 0ba026675..000000000 --- a/trunk/paradiseo-peo/examples/shared/route.h +++ /dev/null @@ -1,20 +0,0 @@ -// "route.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __route_h -#define __route_h - -#include - -#include "node.h" - -typedef eoVector Route; - -unsigned length (const Route & __route); - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/route_eval.cpp b/trunk/paradiseo-peo/examples/shared/route_eval.cpp deleted file mode 100644 index 0fed8d481..000000000 --- a/trunk/paradiseo-peo/examples/shared/route_eval.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// "route_eval.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "route_eval.h" - -void RouteEval :: operator () (Route & __route) { - - __route.fitness (- (int) length (__route)); -} diff --git a/trunk/paradiseo-peo/examples/shared/route_eval.h b/trunk/paradiseo-peo/examples/shared/route_eval.h deleted file mode 100644 index 295f9a39b..000000000 --- a/trunk/paradiseo-peo/examples/shared/route_eval.h +++ /dev/null @@ -1,23 +0,0 @@ -// "route_eval.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __route_eval_h -#define __route_eval_h - -#include - -#include "route.h" - -class RouteEval : public eoEvalFunc { - -public : - - void operator () (Route & __route) ; -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/route_init.cpp b/trunk/paradiseo-peo/examples/shared/route_init.cpp deleted file mode 100644 index 93733f210..000000000 --- a/trunk/paradiseo-peo/examples/shared/route_init.cpp +++ /dev/null @@ -1,23 +0,0 @@ -// "route_init.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include "route_init.h" -#include "node.h" - -void RouteInit :: operator () (Route & __route) { - - __route.clear (); - - for (unsigned i = 0 ; i < numNodes ; i ++) - __route.push_back (i); - - for (unsigned i = 0 ; i < numNodes ; i ++) - std :: swap (__route [i], __route [rng.random (numNodes)]); -} diff --git a/trunk/paradiseo-peo/examples/shared/route_init.h b/trunk/paradiseo-peo/examples/shared/route_init.h deleted file mode 100644 index 937b38265..000000000 --- a/trunk/paradiseo-peo/examples/shared/route_init.h +++ /dev/null @@ -1,23 +0,0 @@ -// "route_init.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __route_init_h -#define __route_init_h - -#include - -#include "route.h" - -class RouteInit : public eoInit { - -public : - - void operator () (Route & __route); -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/two_opt.cpp b/trunk/paradiseo-peo/examples/shared/two_opt.cpp deleted file mode 100644 index 8852ff910..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// "two_opt.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "two_opt.h" - -void TwoOpt :: operator () (Route & __route) { - - unsigned i = 0; - - while ((2 * i) < (second - first)) { - - std :: swap (__route [first + i], __route [second - i]); - i ++; - } -} diff --git a/trunk/paradiseo-peo/examples/shared/two_opt.h b/trunk/paradiseo-peo/examples/shared/two_opt.h deleted file mode 100644 index 0989f5e6e..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt.h +++ /dev/null @@ -1,25 +0,0 @@ -// "two_opt.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __two_opt_h -#define __two_opt_h - -#include -#include - -#include "route.h" - -class TwoOpt : public moMove , public std :: pair { - -public : - - void operator () (Route & __route); - -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.cpp b/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.cpp deleted file mode 100644 index b3985f66e..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.cpp +++ /dev/null @@ -1,24 +0,0 @@ -// "TwoOptIncrEval.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "two_opt_incr_eval.h" -#include "node.h" - -int TwoOptIncrEval :: operator () (const TwoOpt & __move, const Route & __route) { - - /* From */ - Node v1 = __route [__move.first], v1_left = __route [(__move.first - 1 + numNodes) % numNodes]; - - /* To */ - Node v2 = __route [__move.second], v2_right = __route [(__move.second + 1) % numNodes]; - - if (v1 == v2 || v2_right == v1) - return __route.fitness (); - else - return __route.fitness () - distance (v1_left, v2) - distance (v1, v2_right) + distance (v1_left, v1) + distance (v2, v2_right); -} diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.h b/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.h deleted file mode 100644 index 5f88496ed..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_incr_eval.h +++ /dev/null @@ -1,23 +0,0 @@ -// "TwoOptIncrEval.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __two_opt_incr_eval_h -#define __two_opt_incr_eval_h - -#include -#include "two_opt.h" - -class TwoOptIncrEval : public moMoveIncrEval { - -public : - - int operator () (const TwoOpt & __move, const Route & __route) ; - -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_init.cpp b/trunk/paradiseo-peo/examples/shared/two_opt_init.cpp deleted file mode 100644 index e19abc467..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_init.cpp +++ /dev/null @@ -1,14 +0,0 @@ -// "two_opt_init.cpp" - -// (c) OPAC Team, LIFL, 2003 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "two_opt_init.h" - -void TwoOptInit :: operator () (TwoOpt & __move, const Route & __route) { - - __move.first = __move.second = 0; -} diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_init.h b/trunk/paradiseo-peo/examples/shared/two_opt_init.h deleted file mode 100644 index 9b4dd0bad..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_init.h +++ /dev/null @@ -1,24 +0,0 @@ -// "two_opt_init.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __two_opt_init_h -#define __two_opt_init_h - -#include - -#include "two_opt.h" - -class TwoOptInit : public moMoveInit { - -public : - - void operator () (TwoOpt & __move, const Route & __route) ; - -} ; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_next.cpp b/trunk/paradiseo-peo/examples/shared/two_opt_next.cpp deleted file mode 100644 index 9b7f8be16..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_next.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// "two_opt_next.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include "two_opt_next.h" -#include "node.h" - -bool TwoOptNext :: operator () (TwoOpt & __move, const Route & __route) { - - if (__move.first == numNodes - 1 && __move.second == numNodes - 1) - return false; - - else { - - __move.second ++; - if (__move.second == numNodes) { - - __move.first ++; - __move.second = __move.first; - } - return true ; - } -} diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_next.h b/trunk/paradiseo-peo/examples/shared/two_opt_next.h deleted file mode 100644 index cd6605a8d..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_next.h +++ /dev/null @@ -1,24 +0,0 @@ -// "two_opt_next.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __two_opt_next_h -#define __two_opt_next_h - -#include - -#include "two_opt.h" - -class TwoOptNext : public moNextMove { - -public : - - bool operator () (TwoOpt & __move, const Route & __route); - -}; - -#endif diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_rand.cpp b/trunk/paradiseo-peo/examples/shared/two_opt_rand.cpp deleted file mode 100644 index 69d64879b..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_rand.cpp +++ /dev/null @@ -1,21 +0,0 @@ -// "two_opt_rand.cpp" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#include - -#include "two_opt_rand.h" -#include "node.h" - -void TwoOptRand :: operator () (TwoOpt & __move, const Route & __route) { - - __move.second = rng.random (numNodes); - - __move.first = rng.random (__move.second); -} - - diff --git a/trunk/paradiseo-peo/examples/shared/two_opt_rand.h b/trunk/paradiseo-peo/examples/shared/two_opt_rand.h deleted file mode 100644 index 44f602b53..000000000 --- a/trunk/paradiseo-peo/examples/shared/two_opt_rand.h +++ /dev/null @@ -1,24 +0,0 @@ -// "two_opt_rand.h" - -// (c) OPAC Team, LIFL, January 2006 - -/* - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef __two_opt_rand_h -#define __two_opt_rand_h - -#include - -#include "two_opt.h" - -class TwoOptRand : public eoMoveRand { - -public : - - void operator () (TwoOpt & __move, const Route & __route) ; - -} ; - -#endif