diff --git a/trunk/paradiseo-mo/Makefile.am b/trunk/paradiseo-mo/Makefile.am
index ccce19bd0..f691c2558 100755
--- a/trunk/paradiseo-mo/Makefile.am
+++ b/trunk/paradiseo-mo/Makefile.am
@@ -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 \{\} \;
diff --git a/trunk/paradiseo-mo/README b/trunk/paradiseo-mo/README
index f9d9cb7d4..2fd0e63de 100644
--- a/trunk/paradiseo-mo/README
+++ b/trunk/paradiseo-mo/README
@@ -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
===================================================================
diff --git a/trunk/paradiseo-mo/autogen.sh b/trunk/paradiseo-mo/autogen.sh
index 293b7972e..0a4e95695 100755
--- a/trunk/paradiseo-mo/autogen.sh
+++ b/trunk/paradiseo-mo/autogen.sh
@@ -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 || {
diff --git a/trunk/paradiseo-mo/cleaner b/trunk/paradiseo-mo/cleaner
index 5c790e775..1e5c8c5ba 100755
--- a/trunk/paradiseo-mo/cleaner
+++ b/trunk/paradiseo-mo/cleaner
@@ -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 \{\} \;
diff --git a/trunk/paradiseo-mo/configure.in b/trunk/paradiseo-mo/configure.in
index b1bcb2f7d..eacdfe81f 100755
--- a/trunk/paradiseo-mo/configure.in
+++ b/trunk/paradiseo-mo/configure.in
@@ -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"
diff --git a/trunk/paradiseo-mo/docs/html/annotated.html b/trunk/paradiseo-mo/docs/html/annotated.html
index bf52bab4e..7a3fe4944 100644
--- a/trunk/paradiseo-mo/docs/html/annotated.html
+++ b/trunk/paradiseo-mo/docs/html/annotated.html
@@ -58,7 +58,7 @@
| moTS< M > | Tabu Search (TS) |
| moTSMoveLoopExpl< M > | Explorer for a Tabu Search algorithm |
-
Generated on Tue Dec 12 14:28:36 2006 for PARADISEO-MO by
+
Generated on Mon Dec 18 15:12:36 2006 for PARADISEO-MO by
1.5.1
diff --git a/trunk/paradiseo-mo/docs/html/class_empty_selection.html b/trunk/paradiseo-mo/docs/html/class_empty_selection.html
index aa1791529..639e2f5d1 100644
--- a/trunk/paradiseo-mo/docs/html/class_empty_selection.html
+++ b/trunk/paradiseo-mo/docs/html/class_empty_selection.html
@@ -45,7 +45,7 @@ This class is used as an exception that can be thrown if a solution selector has