Update for windows compatibility

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

trunk/paradiseo-mo/src/moGenSolContinue.h

@@ -27,7 +27,7 @@ public:
   /*!
      \param __maxNumGen the maximum number of generation.
    */
-  moGenSolContinue (unsigned __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
+  moGenSolContinue (unsigned int __maxNumGen):maxNumGen (__maxNumGen), numGen (0)
   {
 
   }
@@ -60,10 +60,10 @@ public:
 private:
 
   //! Iteration maximum number.
-  unsigned maxNumGen;
+  unsigned int maxNumGen;
 
   //! Iteration current number.
-  unsigned numGen;
+  unsigned int numGen;
 };
 
 #endif

trunk/paradiseo-mo/src/moItRandNextMove.h

@@ -35,7 +35,7 @@ public:
      \param __max_iter the iteration maximum number.
    */
   moItRandNextMove (moRandMove < M > &__rand_move,
-		    unsigned __max_iter):rand_move (__rand_move),
+		    unsigned int __max_iter):rand_move (__rand_move),
     max_iter (__max_iter), num_iter (0)
   {
 
@@ -74,10 +74,10 @@ private:
   moRandMove < M > &rand_move;
 
   //! Iteration maximum number.
-  unsigned max_iter;
+  unsigned int max_iter;
 
   //! Iteration current number.
-  unsigned num_iter;
+  unsigned int num_iter;
 
 };
 

trunk/paradiseo-mo/src/moLSCheckPoint.h

@@ -34,7 +34,7 @@ public:
   operator   () (const M & __move, const typename M::EOType & __sol)
   {
 
-    for (unsigned i = 0; i < func.size (); i++)
+    for (unsigned int i = 0; i < func.size (); i++)
       {
 	func[i]->operator   ()(__move, __sol);
       }

trunk/paradiseo-mo/src/moSA.h

@@ -87,8 +87,7 @@ public:
 	full_eval (__sol);
       }
 
-    double
-      temp = init_temp;
+    double temp = init_temp;
 
     M move;
 
@@ -140,8 +139,7 @@ private:
   moSolContinue < EOT > &cont;
 
   //! Initial temperature
-  double
-    init_temp;
+  double  init_temp;
 
   //! The cooling schedule
   moCoolingSchedule & cool_sched;

trunk/paradiseo-mo/src/moSimpleMoveTabuList.h

@@ -31,7 +31,7 @@ public:
   /*
     \param __size The maximum size of the move tabu list.
    */
-  moSimpleMoveTabuList(unsigned __size): maxSize(__size)
+  moSimpleMoveTabuList(unsigned int __size): maxSize(__size)
   {
     currentSize=0;
   }
@@ -114,10 +114,10 @@ private:
   }
 
   //! The maximum size of the tabu list.
-  unsigned maxSize;
+  unsigned int maxSize;
 
   //! The current size of the tabu list.
-  unsigned currentSize;
+  unsigned int currentSize;
   
   //! The move tabu list.
   std::list<M> tabuList;

trunk/paradiseo-mo/src/moSimpleSolutionTabuList.h

@@ -31,7 +31,7 @@ public:
   /*!
     \param __size The maximum size of the solution tabu list.
    */
-  moSimpleSolutionTabuList(unsigned __size): maxSize(__size)
+  moSimpleSolutionTabuList(unsigned int __size): maxSize(__size)
   {
     currentSize=0;
   }
@@ -123,10 +123,10 @@ private:
   }
   
   //! The maximum size of the tabu list.
-  unsigned maxSize;
+  unsigned int maxSize;
 
   //! The current size of the tabu list.
-  unsigned currentSize;
+  unsigned int currentSize;
   
   //! The solution tabu list.
   std::list<EOT> tabuList;

trunk/paradiseo-mo/src/moTS.h

@@ -156,14 +156,10 @@ moTS (moMoveExpl < M > &__move_expl, moSolContinue < EOT > &__cont, eoEvalFunc <
 private:
 
   //! Boolean allowing to initialise the ptread_mutex_t in the constructor
-  static
-    bool
-    first_time;
+  static bool first_time;
 
   //! The lock
-  static
-    pthread_mutex_t
-    mutex;
+  static  pthread_mutex_t  mutex;
 
   //! Neighborhood explorer
   moMoveExpl < M > &move_expl;