added initial files coming from the trunk (r=920) for the branch 2.0

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

branches/paradiseo-ix86-2.0/paradiseo-mo/tutorial/Lesson1/CMakeLists.txt

@@ -0,0 +1,83 @@
+
+
+######################################################################################
+### 1) Include the sources
+######################################################################################
+
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src)
+INCLUDE_DIRECTORIES(${EO_SRC_DIR}/src/utils)
+INCLUDE_DIRECTORIES(${ParadisEO-MO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${TSP_SRC_DIR})
+######################################################################################
+
+
+
+######################################################################################
+### 2) Specify where CMake can find the libraries
+######################################################################################
+
+IF(NOT WIN32 OR CYGWIN)  
+  LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${TSP_BINARY_DIR}/lib)
+ENDIF(NOT WIN32 OR CYGWIN)
+
+# especially for Visual Studio
+IF(WIN32 AND NOT CYGWIN)  
+  	LINK_DIRECTORIES(${EO_BIN_DIR}\\lib\\${CMAKE_BUILD_TYPE})
+ENDIF(WIN32 AND NOT CYGWIN) 
+
+######################################################################################
+
+
+
+######################################################################################
+### 3) Define your target(s): just an executable here
+######################################################################################
+
+ADD_EXECUTABLE(hill_climbing hill_climbing.cpp) 
+
+ADD_DEPENDENCIES(hill_climbing tsp)
+######################################################################################
+
+
+
+######################################################################################
+### 4) Optionnal: define your target(s)'s version: no effect for windows
+######################################################################################
+
+SET(HILLCLIMBING_VERSION ${GLOBAL_VERSION})
+SET_TARGET_PROPERTIES(hill_climbing PROPERTIES VERSION "${HILLCLIMBING_VERSION}")
+######################################################################################
+
+
+
+######################################################################################
+### 5) Link the librairies for your target(s)
+######################################################################################
+
+TARGET_LINK_LIBRARIES(hill_climbing tsp eo eoutils) 
+
+######################################################################################
+
+
+
+######################################################################################
+### 6) Windows advanced config - especially for Microsoft Visual Studio 8
+######################################################################################
+
+  IF(CMAKE_CXX_COMPILER MATCHES cl)
+   IF(NOT WITH_SHARED_LIBS)
+     IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
+       SET(CMAKE_CXX_FLAGS "/nologo /W3 /Gy")
+       SET(CMAKE_CXX_FLAGS_DEBUG "/MTd /Z7 /Od")
+       SET(CMAKE_CXX_FLAGS_RELEASE "/MT /O2")
+       SET(CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O2")
+       SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MTd /Z7 /Od")
+       SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:CONSOLE")
+       
+     ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005")
+   ENDIF(NOT WITH_SHARED_LIBS)
+  ENDIF(CMAKE_CXX_COMPILER MATCHES cl)
+######################################################################################
+
+
+

branches/paradiseo-ix86-2.0/paradiseo-mo/tutorial/Lesson1/hill_climbing.cpp

@@ -0,0 +1,84 @@
+/*
+  <hill_climbing.cpp>
+  Copyright (C) DOLPHIN Project-Team, INRIA Futurs, 2006-2008
+  (C) OPAC Team, LIFL, 2002-2008
+
+  Sébastien Cahon, Jean-Charles Boisson
+
+  This software is governed by the CeCILL license under French law and
+  abiding by the rules of distribution of free software.  You can  use,
+  modify and/ or redistribute the software under the terms of the CeCILL
+  license as circulated by CEA, CNRS and INRIA at the following URL
+  "http://www.cecill.info".
+
+  As a counterpart to the access to the source code and  rights to copy,
+  modify and redistribute granted by the license, users are provided only
+  with a limited warranty  and the software's author,  the holder of the
+  economic rights,  and the successive licensors  have only  limited liability.
+
+  In this respect, the user's attention is drawn to the risks associated
+  with loading,  using,  modifying and/or developing or reproducing the
+  software by the user in light of its specific status of free software,
+  that may mean  that it is complicated to manipulate,  and  that  also
+  therefore means  that it is reserved for developers  and  experienced
+  professionals having in-depth computer knowledge. Users are therefore
+  encouraged to load and test the software's suitability as regards their
+  requirements in conditions enabling the security of their systems and/or
+  data to be ensured and,  more generally, to use and operate it in the
+  same conditions as regards security.
+  The fact that you are presently reading this means that you have had
+  knowledge of the CeCILL license and that you accept its terms.
+
+  ParadisEO WebSite : http://paradiseo.gforge.inria.fr
+  Contact: paradiseo-help@lists.gforge.inria.fr
+*/
+
+#include <mo>
+#include <tsp>
+
+int
+main (int _argc, char* _argv [])
+{
+  if (_argc != 2)
+    {
+
+      std :: cerr << "Usage : ./hill_climbing [instance]" << std :: endl;
+      return EXIT_FAILURE;
+    }
+
+  srand (1000);
+
+  Graph::load(_argv [1]);
+
+  Route solution;
+
+  RouteInit initializer;
+  initializer (solution);
+
+  RouteEval full_evaluation;
+  full_evaluation (solution);
+
+  std :: cout << "[From] " << solution << std :: endl;
+
+  /* Tools for an efficient (? :-))
+     local search ! */
+
+  TwoOptInit two_opt_initializer;
+
+  TwoOptNext two_opt_next_move_generator;
+
+  TwoOptIncrEval two_opt_incremental_evaluation;
+
+  //moFirstImprSelect <TwoOpt> two_opt_selection;
+  moBestImprSelect <TwoOpt> two_opt_selection;
+  //moRandImprSelect <TwoOpt> two_opt_selection;
+
+  moHC <TwoOpt> hill_climbing (two_opt_initializer, two_opt_next_move_generator, two_opt_incremental_evaluation, 
+			       two_opt_selection, full_evaluation);
+  hill_climbing (solution) ;
+  
+  std :: cout << "[To] " << solution << std :: endl;
+  
+  return EXIT_SUCCESS;
+}
+