New style for PEO

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

trunk/paradiseo-peo/README

@@ -58,6 +58,8 @@ structure:
    |
    |
    +-- tutorial          APPLICATIONS
+       |
+       +-- examples      TSP
        |
        +-- Introduction  Technical introduction
        |
@@ -69,7 +71,9 @@ structure:
        |
        +-- Lesson4       PSO and EA completely parallel
        |
-       +-- Lesson5       Multi-start : several local searches
+       +-- Lesson5       Hybridization
+       |
+       +-- Lesson6       Multi-start : several local searches
 
 ===================================================================
               NOTES

trunk/paradiseo-peo/src/core/communicable.cpp

@@ -46,7 +46,8 @@ static std :: map <const Communicable *, unsigned> comm_to_key; /* Map of regist
 
 unsigned Communicable :: num_comm = 0;
 
-Communicable :: Communicable () {
+Communicable :: Communicable ()
+{
 
   comm_to_key [this] = key = ++ num_comm;
   key_to_comm.push_back (this);
@@ -54,41 +55,48 @@ Communicable :: Communicable () {
   sem_init (& sem_stop, 0, 0);
 }
 
-Communicable :: ~ Communicable () {
+Communicable :: ~ Communicable ()
-
+{
 }
 
-COMM_ID Communicable :: getKey () {
+COMM_ID Communicable :: getKey ()
+{
 
   return key;
 }
 
-Communicable * getCommunicable (COMM_ID __key) {
+Communicable * getCommunicable (COMM_ID __key)
+{
 
   assert (__key < key_to_comm.size ());
   return key_to_comm [__key];
 }
 
-COMM_ID getKey (const Communicable * __comm) {
+COMM_ID getKey (const Communicable * __comm)
+{
 
   return comm_to_key [__comm];
 }
 
-void Communicable :: lock () {
+void Communicable :: lock ()
+  {
 
-  sem_wait (& sem_lock);
+    sem_wait (& sem_lock);
-}
+  }
 
-void Communicable :: unlock () {
+void Communicable :: unlock ()
+{
 
   sem_post (& sem_lock);
 }
 
-void Communicable :: stop () {
+void Communicable :: stop ()
+{
   sem_wait (& sem_stop);
 }
 
-void Communicable :: resume () {
+void Communicable :: resume ()
+{
 
   sem_post (& sem_stop);
 }

trunk/paradiseo-peo/src/core/communicable.h

@@ -41,32 +41,33 @@
 
 typedef unsigned COMM_ID;
 
-class Communicable {
+class Communicable
+  {
 
-public :
+  public :
 
-  Communicable ();
+    Communicable ();
 
-  virtual ~ Communicable ();
+    virtual ~ Communicable ();
 
-  COMM_ID getKey ();  
+    COMM_ID getKey ();
 
-  void lock (); /* It suspends the current process if the semaphore is locked */
+    void lock (); /* It suspends the current process if the semaphore is locked */
-  void unlock (); /* It unlocks the shared semaphore */
+    void unlock (); /* It unlocks the shared semaphore */
 
-  void stop (); /* It suspends the current process */
+    void stop (); /* It suspends the current process */
-  void resume (); /* It resumes ___________ */
+    void resume (); /* It resumes ___________ */
 
-protected :
+  protected :
 
-  COMM_ID key;
+    COMM_ID key;
 
-  sem_t sem_lock;
+    sem_t sem_lock;
 
-  sem_t sem_stop;
+    sem_t sem_stop;
 
-  static unsigned num_comm;
+    static unsigned num_comm;
-};
+  };
 
 extern Communicable * getCommunicable (COMM_ID __key);
 

trunk/paradiseo-peo/src/core/cooperative.h

@@ -42,27 +42,28 @@
 
 typedef unsigned COOP_ID;
 
-class Cooperative : public Communicable {
+class Cooperative : public Communicable
+  {
 
-public :
+  public :
 
-  Runner * getOwner ();
+    Runner * getOwner ();
 
-  void setOwner (Runner & __runner);
+    void setOwner (Runner & __runner);
 
-  virtual void pack () = 0;
+    virtual void pack () = 0;
 
-  virtual void unpack () = 0;
+    virtual void unpack () = 0;
 
-  void send (Cooperative * __coop); 
+    void send (Cooperative * __coop);
 
-  virtual void notifySending ();
+    virtual void notifySending ();
 
-private :
+  private :
 
-  Runner * owner;
+    Runner * owner;
 
-};
+  };
 
 extern Cooperative * getCooperative (COOP_ID __key);
 

trunk/paradiseo-peo/src/core/eoPop_comm.h

@@ -41,14 +41,16 @@
 
 #include "messaging.h"
 
-template <class EOT> void pack (const eoPop <EOT> & __pop) {
+template <class EOT> void pack (const eoPop <EOT> & __pop)
+{
 
   pack ((unsigned) __pop.size ());
   for (unsigned i = 0; i < __pop.size (); i ++)
     pack (__pop [i]);
 }
 
-template <class EOT> void unpack (eoPop <EOT> & __pop) {
+template <class EOT> void unpack (eoPop <EOT> & __pop)
+{
 
   unsigned n;
 

trunk/paradiseo-peo/src/core/eoVector_comm.h

@@ -41,34 +41,36 @@
 
 #include "messaging.h"
 
-template <class F, class T> void pack (const eoVector <F, T> & __v) {
+template <class F, class T> void pack (const eoVector <F, T> & __v)
+{
 
 
   if ( !__v.invalid() )
-  {
+    {
-	  pack( (unsigned int) 1 );
+      pack( (unsigned int) 1 );
       pack (__v.fitness ()) ;
-  }
+    }
   else
-      pack( (unsigned int) 0 );
+    pack( (unsigned int) 0 );
   unsigned len = __v.size ();
   pack (len);
   for (unsigned i = 0 ; i < len; i ++)
     pack (__v [i]);
 }
 
-template <class F, class T> void unpack (eoVector <F, T> & __v) {
+template <class F, class T> void unpack (eoVector <F, T> & __v)
+{
 
   F fit;
   unsigned int vfit;
   unpack( vfit );
   if ( vfit )
-  {
+    {
-  	  unpack (fit);
+      unpack (fit);
       __v.fitness (fit);
-  }
+    }
   else
-      __v.invalidate();
+    __v.invalidate();
   unsigned len;
   unpack (len);
   __v.resize (len);
@@ -76,7 +78,8 @@ template <class F, class T> void unpack (eoVector <F, T> & __v) {
     unpack (__v [i]);
 }
 
-template <class F, class T, class V> void pack (const eoVectorParticle <F, T, V> & __v) {
+template <class F, class T, class V> void pack (const eoVectorParticle <F, T, V> & __v)
+{
 
   pack (__v.fitness ()) ;
   pack (__v.best());
@@ -90,7 +93,8 @@ template <class F, class T, class V> void pack (const eoVectorParticle <F, T, V>
     pack (__v.velocities[i]);
 }
 
-template <class F, class T, class V> void unpack (eoVectorParticle <F, T, V> & __v) {
+template <class F, class T, class V> void unpack (eoVectorParticle <F, T, V> & __v)
+{
 
   F fit;
   unpack(fit);

trunk/paradiseo-peo/src/core/messaging.h

@@ -70,13 +70,15 @@ extern void pack (const unsigned long & __ul, int __nitem = 1);
 extern void pack (const char * __str);
 
 /* Pointer */
-template <class T> void pack (const T * __ptr) {
+template <class T> void pack (const T * __ptr)
+{
 
   pack ((unsigned long) __ptr);
 }
 
 /* Pair */
-template <class U, class V> void pack (const std :: pair <U, V> & __pair) {
+template <class U, class V> void pack (const std :: pair <U, V> & __pair)
+{
 
   pack (__pair.first);
   pack (__pair.second);
@@ -116,7 +118,8 @@ extern void unpack (unsigned long & __ul, int __nitem = 1);
 extern void unpack (char * __str);
 
 /* Pointer */
-template <class T> void unpack (T * & __ptr) {
+template <class T> void unpack (T * & __ptr)
+{
 
   unsigned long p;
   unpack (p);
@@ -124,7 +127,8 @@ template <class T> void unpack (T * & __ptr) {
 }
 
 /* Pair */
-template <class U, class V> void unpack (std :: pair <U, V> & __pair) {
+template <class U, class V> void unpack (std :: pair <U, V> & __pair)
+{
 
   unpack (__pair.first);
   unpack (__pair.second);

trunk/paradiseo-peo/src/core/peo_debug.cpp

@@ -56,7 +56,8 @@ static char host [MAX_BUFF_SIZE];
 
 std :: vector <FILE *> files;
 
-void setDebugMode (bool __dbg) {
+void setDebugMode (bool __dbg)
+{
 
   debug = __dbg;
   gethostname (host, MAX_BUFF_SIZE);
@@ -64,7 +65,8 @@ void setDebugMode (bool __dbg) {
 
 extern int getNodeRank ();
 
-void initDebugging () {
+void initDebugging ()
+{
 
   mkdir (DEBUG_PATH, S_IRWXU);
   //  files.push_back (stdout);
@@ -73,33 +75,37 @@ void initDebugging () {
   files.push_back (fopen (buff, "w"));
 }
 
-void endDebugging () {
+void endDebugging ()
+{
 
   for (unsigned i = 0; i < files.size (); i ++)
     if (files [i] != stdout)
       fclose (files [i]);
 }
 
-void printDebugMessage (const char * __mess) {
+void printDebugMessage (const char * __mess)
+{
 
-  if (debug) {
+  if (debug)
+    {
 
-    char buff [MAX_BUFF_SIZE];
+      char buff [MAX_BUFF_SIZE];
-    time_t t = time (0);
+      time_t t = time (0);
 
-    /* Date */
+      /* Date */
-    sprintf (buff, "[%s][%s: ", host, ctime (& t));
+      sprintf (buff, "[%s][%s: ", host, ctime (& t));
-    * strchr (buff, '\n') = ']';
+      * strchr (buff, '\n') = ']';
-    for (unsigned i = 0; i < files.size (); i ++)
+      for (unsigned i = 0; i < files.size (); i ++)
-      fprintf (files [i], buff);
+        fprintf (files [i], buff);
 
-    /* Message */
+      /* Message */
-    sprintf (buff, "%s", __mess);
+      sprintf (buff, "%s", __mess);
 
-    for (unsigned i = 0; i < files.size (); i ++) {
+      for (unsigned i = 0; i < files.size (); i ++)
-      fputs (buff, files [i]);
+        {
-      fputs ("\n", files [i]);
+          fputs (buff, files [i]);
-      fflush (files [i]);
+          fputs ("\n", files [i]);
+          fflush (files [i]);
+        }
     }
-  }
 }

trunk/paradiseo-peo/src/core/peo_fin.cpp

@@ -39,7 +39,8 @@
 #include "runner.h"
 #include "rmc.h"
 
-void peo :: finalize () {
+void peo :: finalize ()
+{
 
   printDebugMessage ("waiting for the termination of all threads");
 

trunk/paradiseo-peo/src/core/peo_fin.h

@@ -37,7 +37,8 @@
 #ifndef __peo_finalize_h
 #define __peo_finalize_h
 
-namespace peo {
+namespace peo
+  {
 
   extern void finalize ();
 }

trunk/paradiseo-peo/src/core/peo_init.cpp

@@ -41,13 +41,15 @@
 #include "peo_debug.h"
 #include "rmc.h"
 
-namespace peo {
+namespace peo
+  {
 
   int * argc;
 
   char * * * argv;
 
-  void init (int & __argc, char * * & __argv) {
+  void init (int & __argc, char * * & __argv)
+  {
 
     argc = & __argc;
 

trunk/paradiseo-peo/src/core/peo_init.h

@@ -37,7 +37,8 @@
 #ifndef __peo_init_h
 #define __peo_init_h
 
-namespace peo {
+namespace peo
+  {
 
   extern int * argc;
 

trunk/paradiseo-peo/src/core/peo_param.cpp

@@ -41,7 +41,8 @@
 
 
 
-void peo :: loadParameters (int & __argc, char * * & __argv) {
+void peo :: loadParameters (int & __argc, char * * & __argv)
+{
 
   eoParser parser (__argc, __argv);
 

trunk/paradiseo-peo/src/core/peo_param.h

@@ -37,7 +37,8 @@
 #ifndef __peo_param_h
 #define __peo_param_h
 
-namespace peo {
+namespace peo
+  {
 
   extern void loadParameters (int & __argc, char * * & __argv);
 }

trunk/paradiseo-peo/src/core/peo_run.cpp

@@ -39,7 +39,8 @@
 #include "rmc.h"
 #include "runner.h"
 
-void peo :: run () {
+void peo :: run ()
+{
 
   startRunners ();
 

trunk/paradiseo-peo/src/core/peo_run.h

@@ -37,7 +37,8 @@
 #ifndef __peo_run_h
 #define __peo_run_h
 
-namespace peo {
+namespace peo
+  {
 
   extern void run ();
 }

trunk/paradiseo-peo/src/core/reac_thread.cpp

@@ -40,23 +40,27 @@ static bool the_end = false;
 
 static std :: vector <ReactiveThread *> reac_threads;
 
-ReactiveThread :: ReactiveThread () {
+ReactiveThread :: ReactiveThread ()
+{
 
   reac_threads.push_back (this);
   sem_init (& sem, 0, 0);
 }
 
-void ReactiveThread :: sleep () {
+void ReactiveThread :: sleep ()
+{
 
   sem_wait (& sem);
 }
 
-void ReactiveThread :: wakeUp () {
+void ReactiveThread :: wakeUp ()
+{
 
   sem_post (& sem);
 }
 
-void stopReactiveThreads () {
+void stopReactiveThreads ()
+{
 
   the_end = true;
   for (unsigned i = 0; i < reac_threads.size (); i ++)

trunk/paradiseo-peo/src/core/reac_thread.h

@@ -41,22 +41,23 @@
 
 #include "thread.h"
 
-class ReactiveThread : public Thread {
+class ReactiveThread : public Thread
+  {
 
-public:
+  public:
 
-  /* Ctor */
+    /* Ctor */
-  ReactiveThread ();
+    ReactiveThread ();
 
-  void sleep ();
+    void sleep ();
 
-  void wakeUp ();
+    void wakeUp ();
 
-private:
+  private:
 
-  sem_t sem;
+    sem_t sem;
 
-};
+  };
 
 extern void stopReactiveThreads ();
 

trunk/paradiseo-peo/src/core/ring_topo.cpp

@@ -37,17 +37,19 @@
 #include "ring_topo.h"
 
 void RingTopology :: setNeighbors (Cooperative * __mig,
-				   std :: vector <Cooperative *> & __from,
+                                   std :: vector <Cooperative *> & __from,
-				   std :: vector <Cooperative *> & __to) {
+                                   std :: vector <Cooperative *> & __to)
+{
   __from.clear () ;
   __to.clear () ;
 
-    int len = mig.size () ;
+  int len = mig.size () ;
 
-    for (int i = 0 ; i < len ; i ++)      
+  for (int i = 0 ; i < len ; i ++)
-      if (mig [i] == __mig) {	
+    if (mig [i] == __mig)
-	__from.push_back (mig [(i - 1 + len) % len]) ;
+      {
-	__to.push_back (mig [(i + 1) % len]) ;	
+        __from.push_back (mig [(i - 1 + len) % len]) ;
-	break;
+        __to.push_back (mig [(i + 1) % len]) ;
+        break;
       }
 }