git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@74 331e1502-861f-0410-8da2-ba01fb791d7f

This commit is contained in:
legrand 2006-12-19 08:31:07 +00:00
commit 59f3f6a56f
121 changed files with 177 additions and 144 deletions

View file

@ -1,10 +1,22 @@
SUBDIRS = docs src examples
SUBDIRS = docs src tutorial
CXX=g++
AM_CXXFLAGS =\
-Wall\
-Werror\
-Wno-deprecated\
-ansi\
-pedantic
clean_all: clean_aux clean_doc
-@make clean
-@(rm -rf aclocal.m4 autom4te.cache configure config.* CO* dep* INST* install-sh miss* mkins* Makefile Makefile.in;\
cd docs; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../examples; rm -rf Makefile Makefile.in;\
cd tsp; rm -rf .deps/ Makefile Makefile.in; cd share ; rm -rf .deps/)
-@(rm -rf acconfig.h acinclude.m4 aclocal.m4 autom4te.cache copying install news readme stamp* texput.log authors todo;\
rm -f configure config.* CO* dep* INST* install-sh miss* mkins* Makefile Makefile.in;\
cd docs; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../tutorial; rm -rf Makefile Makefile.in;\
cd examples; rm -f Makefile Makefile.in; cd tsp ; rm -f Makefile Makefile.in; cd src ; rm -rf .deps/ Makefile Makefile.in;\
cd ../../../Lesson1 ; rm -rf .deps/ Makefile Makefile.in; cd ../Lesson2 ; rm -rf .deps/ Makefile Makefile.in ; cd ../Lesson3 ;\
rm -rf .deps/ Makefile Makefile.in)
clean_aux:
-@find . \( -name "*~" -o -name "*.old" -o -name "#*" -o -name "*.bak" \) -print -exec rm -rf \{\} \;

View file

@ -15,13 +15,9 @@ Go to your build-directory and run
make
make doc
where $(SRCDIR) is the top-level source directory of EO, i.e. where
where $(SRCDIR) is the top-level source directory of ParadisEO-MO, i.e. where
the sources where unpacked.
In case of problems, you can read the INSTALL file - but remember this
is a standard installation file from GNU and that it contains nothing
specific about MO.
To clean everything, in the simply run
make clean_all
@ -45,17 +41,27 @@ structure:
| +- man Unix man format documentation.
|
|
+-- test TEST files - for debugging purposes only.
|
|
+-- examples APPLICATIONS - one directory per separate application.
+-- tutorial TUTORIAL with lessons
|
+- tsp traveling salesman problem example with main algorithms.
|
+-benchs Instance files for testing.
|
+-share sources files.
+-examples APPLICATIONS - one directory per separate application.
| |
| +- tsp traveling salesman problem example.
| |
| +-src sources files for the lesson examples using the tsp.
| |
| +-benchs TSP Instance files.
|
+-Lesson1 How make a Hill Climbing on the TSP example.
| |
| +-benchs TSP Instance files.
|
+-Lesson2 How make a Tabu Search on the TSP example.
| |
| +-benchs TSP Instance files.
|
+-Lesson3 How make a Simulated Annealing on the TSP example.
|
+-benchs TSP Instance files.
===================================================================
NOTES
===================================================================

View file

@ -55,6 +55,12 @@ grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
NO_AUTOMAKE=yes
}
(doxygen --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "**WARNING**: You need to have \`doxygen' to generate the documentation."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
}
# if no automake, don't bother testing for aclocal
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {

View file

@ -1,4 +1,7 @@
(rm -rf aclocal.m4 autom4te.cache configure config.* CO* dep* INST* install-sh miss* mkins* Makefile Makefile.in;\
cd docs; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../examples; rm -rf Makefile Makefile.in;\
cd tsp; rm -rf .deps/ Makefile Makefile.in; cd share ; rm -rf .deps/)
(rm -rf acconfig.h acinclude.m4 aclocal.m4 autom4te.cache copying install news readme stamp* texput.log authors todo;\
rm -f configure config.* CO* dep* INST* install-sh miss* mkins* Makefile Makefile.in;\
cd docs; rm -rf Makefile Makefile.in; cd ../src ; rm -rf Makefile Makefile.in; cd ../tutorial; rm -rf Makefile Makefile.in;\
cd examples; rm -f Makefile Makefile.in; cd tsp ; rm -f Makefile Makefile.in; cd src ; rm -rf .deps/ Makefile Makefile.in;\
cd ../../../Lesson1 ; rm -rf .deps/ Makefile Makefile.in; cd ../Lesson2 ; rm -rf .deps/ Makefile Makefile.in ; cd ../Lesson3 ;\
rm -rf .deps/ Makefile Makefile.in)
find . \( -name "*~" -o -name "*.old" -o -name "#*" -o -name "*.bak" -o -name "*.o" \) -print -exec rm -rf \{\} \;

View file

@ -1,11 +1,11 @@
AC_INIT(configure.in)
AM_INIT_AUTOMAKE(mo, 0.1)
AM_INIT_AUTOMAKE(paradiseo-mo, 0.1)
AC_ISC_POSIX
AC_PROG_CXX
AM_PROG_CC_STDC
AC_HEADER_STDC
AC_CXX_HAVE_SSTREAM
#AC_CXX_HAVE_SSTREAM
AC_PROG_RANLIB
AC_PROG_INSTALL
@ -40,7 +40,13 @@ AC_OUTPUT([
Makefile
src/Makefile
docs/Makefile
examples/Makefile
examples/tsp/Makefile
examples/tsp/share/Makefile
tutorial/Makefile
tutorial/examples/Makefile
tutorial/examples/tsp/Makefile
tutorial/examples/tsp/src/Makefile
tutorial/Lesson1/Makefile
tutorial/Lesson2/Makefile
tutorial/Lesson3/Makefile
])
echo "Type 'make doc' for building documentation"

View file

@ -58,7 +58,7 @@
<tr><td class="indexkey"><a class="el" href="classmo_t_s.html">moTS&lt; M &gt;</a></td><td class="indexvalue">Tabu Search (TS) </td></tr>
<tr><td class="indexkey"><a class="el" href="classmo_t_s_move_loop_expl.html">moTSMoveLoopExpl&lt; M &gt;</a></td><td class="indexvalue">Explorer for a Tabu Search algorithm </td></tr>
</table>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -45,7 +45,7 @@ This class is used as an exception that can be thrown if a solution selector has
<p>
Definition at line <a class="el" href="mo_move_select_8h-source.html#l00021">21</a> of file <a class="el" href="mo_move_select_8h-source.html">moMoveSelect.h</a>.<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_move_select_8h-source.html">moMoveSelect.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -45,7 +45,7 @@
</td><td><a class="el" href="classmo_move_expl.html">moMoveExpl</a>&nbsp;&nbsp;&nbsp;</td><td><a name="letter_T"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;T&nbsp;&nbsp;</div></td></tr></table>
</td></tr><tr><td><a class="el" href="classmo_first_impr_select.html">moFirstImprSelect</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classmo_move_incr_eval.html">moMoveIncrEval</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classmo_tabu_list.html">moTabuList</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a name="letter_G"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&nbsp;&nbsp;G&nbsp;&nbsp;</div></td></tr></table>
</td><td><a class="el" href="classmo_move_init.html">moMoveInit</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classmo_t_s.html">moTS</a>&nbsp;&nbsp;&nbsp;</td></tr><tr><td><a class="el" href="classmo_gen_sol_continue.html">moGenSolContinue</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classmo_move_loop_expl.html">moMoveLoopExpl</a>&nbsp;&nbsp;&nbsp;</td><td><a class="el" href="classmo_t_s_move_loop_expl.html">moTSMoveLoopExpl</a>&nbsp;&nbsp;&nbsp;</td></tr></table><p><div class="qindex"><a class="qindex" href="#letter_A">A</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_B">B</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_C">C</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_E">E</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_F">F</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_G">G</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_H">H</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_I">I</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_L">L</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_M">M</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_N">N</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_R">R</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_S">S</a>&nbsp;|&nbsp;<a class="qindex" href="#letter_T">T</a></div><p>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -48,7 +48,7 @@ Description of an algorithm of the mo library.
<p>
Definition at line <a class="el" href="mo_algo_8h-source.html#l00021">21</a> of file <a class="el" href="mo_algo_8h-source.html">moAlgo.h</a>.<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_algo_8h-source.html">moAlgo.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -30,7 +30,7 @@
</ul></div>
<h1>moAspirCrit&lt; M &gt; Member List</h1>This is the complete list of members for <a class="el" href="classmo_aspir_crit.html">moAspirCrit&lt; M &gt;</a>, including all inherited members.<p><table>
<tr class="memlist"><td><a class="el" href="classmo_aspir_crit.html#a8ce84510a5ec7c9078381e542c6d140">init</a>()=0</td><td><a class="el" href="classmo_aspir_crit.html">moAspirCrit&lt; M &gt;</a></td><td><code> [pure virtual]</code></td></tr>
</table><hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
</table><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -84,7 +84,7 @@ Implemented in <a class="el" href="classmo_impr_best_fit_aspir_crit.html#ffa451a
</div><p>
<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_aspir_crit_8h-source.html">moAspirCrit.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -36,7 +36,7 @@
<tr class="memlist"><td><a class="el" href="classmo_best_impr_select.html#2d2abf9aa17dc77cbb4f41810ab7b956">init</a>(const Fitness &amp;__fit)</td><td><a class="el" href="classmo_best_impr_select.html">moBestImprSelect&lt; M &gt;</a></td><td><code> [inline, virtual]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_best_impr_select.html#169773d4d127acd782cf379f758222da">operator()</a>(M &amp;__move, Fitness &amp;__fit)</td><td><a class="el" href="classmo_best_impr_select.html">moBestImprSelect&lt; M &gt;</a></td><td><code> [inline]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_best_impr_select.html#d10e3e6f8a0277731e95ef506d064d6d">update</a>(const M &amp;__move, const Fitness &amp;__fit)</td><td><a class="el" href="classmo_best_impr_select.html">moBestImprSelect&lt; M &gt;</a></td><td><code> [inline, virtual]</code></td></tr>
</table><hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
</table><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -178,7 +178,7 @@ References <a class="el" href="mo_best_impr_select_8h-source.html#l00089">moBest
</div><p>
<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_best_impr_select_8h-source.html">moBestImprSelect.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -50,7 +50,7 @@ It is only a description... An object that herits from this class is needed to b
<p>
Definition at line <a class="el" href="mo_cool_sched_8h-source.html#l00022">22</a> of file <a class="el" href="mo_cool_sched_8h-source.html">moCoolSched.h</a>.<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_cool_sched_8h-source.html">moCoolSched.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -33,7 +33,7 @@
<tr class="memlist"><td><a class="el" href="classmo_easy_cool_sched.html#ca08df878417ef1124e6933a9c2d7a0b">operator()</a>(double &amp;__temp)</td><td><a class="el" href="classmo_easy_cool_sched.html">moEasyCoolSched</a></td><td><code> [inline]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_easy_cool_sched.html#1f84deff87defafd927e8c323b188f38">ratio</a></td><td><a class="el" href="classmo_easy_cool_sched.html">moEasyCoolSched</a></td><td><code> [private]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_easy_cool_sched.html#3dd53700390b7bb6428db80e01626c83">threshold</a></td><td><a class="el" href="classmo_easy_cool_sched.html">moEasyCoolSched</a></td><td><code> [private]</code></td></tr>
</table><hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
</table><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -140,7 +140,7 @@ References <a class="el" href="mo_easy_cool_sched_8h-source.html#l00056">ratio</
</div><p>
<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_easy_cool_sched_8h-source.html">moEasyCoolSched.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -38,7 +38,7 @@
<tr class="memlist"><td><a class="el" href="classmo_first_impr_select.html#7ba0882728daedc75c249647c070ccf0">update</a>(const M &amp;__move, const typename M::EOType::Fitness &amp;__fit)</td><td><a class="el" href="classmo_first_impr_select.html">moFirstImprSelect&lt; M &gt;</a></td><td><code> [inline]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_move_select.html#7c157b6e64fd417acf6e900059204eb1">moMoveSelect::update</a>(const M &amp;__move, const Fitness &amp;__fit)=0</td><td><a class="el" href="classmo_move_select.html">moMoveSelect&lt; M &gt;</a></td><td><code> [pure virtual]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_first_impr_select.html#a99c0586ba07449234705c17a258d58c">valid</a></td><td><a class="el" href="classmo_first_impr_select.html">moFirstImprSelect&lt; M &gt;</a></td><td><code> [private]</code></td></tr>
</table><hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
</table><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -209,7 +209,7 @@ References <a class="el" href="mo_first_impr_select_8h-source.html#l00100">moFir
</div><p>
<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_first_impr_select_8h-source.html">moFirstImprSelect.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -34,7 +34,7 @@
<tr class="memlist"><td><a class="el" href="classmo_gen_sol_continue.html#6b6cab23a23bd8904ea52ef5141d8d0a">moGenSolContinue</a>(unsigned __maxNumGen)</td><td><a class="el" href="classmo_gen_sol_continue.html">moGenSolContinue&lt; EOT &gt;</a></td><td><code> [inline]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_gen_sol_continue.html#a18ebfd270f96517b4edaa2cad3eb9e0">numGen</a></td><td><a class="el" href="classmo_gen_sol_continue.html">moGenSolContinue&lt; EOT &gt;</a></td><td><code> [private]</code></td></tr>
<tr class="memlist"><td><a class="el" href="classmo_gen_sol_continue.html#457257cd73b474d6f7783d84d02c2e61">operator()</a>(const EOT &amp;__sol)</td><td><a class="el" href="classmo_gen_sol_continue.html">moGenSolContinue&lt; EOT &gt;</a></td><td><code> [inline]</code></td></tr>
</table><hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
</table><hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

View file

@ -169,7 +169,7 @@ References <a class="el" href="mo_gen_sol_continue_8h-source.html#l00066">moGenS
</div><p>
<hr>The documentation for this class was generated from the following file:<ul>
<li><a class="el" href="mo_gen_sol_continue_8h-source.html">moGenSolContinue.h</a></ul>
<hr size="1"><address style="align: right;"><small>Generated on Tue Dec 12 14:28:37 2006 for PARADISEO-MO by&nbsp;
<hr size="1"><address style="align: right;"><small>Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by&nbsp;
<a href="http://www.doxygen.org/index.html">
<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.1 </small></address>
</body>

Some files were not shown because too many files have changed in this diff Show more