From b6a9be62b0dfa493f5efa971a31c53e7c02883e6 Mon Sep 17 00:00:00 2001
From: jhumeau <jhumeau@331e1502-861f-0410-8da2-ba01fb791d7f>
Date: Fri, 4 Jun 2010 13:14:11 +0000
Subject: [PATCH] debug moeo

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1838 331e1502-861f-0410-8da2-ba01fb791d7f
---
 trunk/paradiseo-peo/CMakeLists.txt           |   8 +-
 trunk/paradiseo-peo/src/core/eoVector_mesg.h | 155 +------------------
 2 files changed, 5 insertions(+), 158 deletions(-)

diff --git a/trunk/paradiseo-peo/CMakeLists.txt b/trunk/paradiseo-peo/CMakeLists.txt
index 03c830cc7..f22c8d5b6 100644
--- a/trunk/paradiseo-peo/CMakeLists.txt
+++ b/trunk/paradiseo-peo/CMakeLists.txt
@@ -46,10 +46,10 @@ PROJECT(ParadisEO-PEO)
 
 SET(PACKAGE_BUGREPORT "paradiseo-help@lists.gforge.inria.fr" CACHE STRING "Package bug report" FORCE)
 SET(PACKAGE_NAME "ParadisEO-PEO - Parallel and distributed Evolving Objects" CACHE STRING "Package name" FORCE)
-SET(PACKAGE_STRING "ParadisEO-PEO 1.2" CACHE STRING "PEO Package string full name" FORCE)
-SET(PACKAGE_VERSION "1.2" CACHE STRING "Package version" FORCE)
-SET(GLOBAL_VERSION "1.2" CACHE STRING "Global version" FORCE)
-SET(VERSION "1.2" CACHE STRING "Version" FORCE)
+SET(PACKAGE_STRING "ParadisEO-PEO 1.3" CACHE STRING "PEO Package string full name" FORCE)
+SET(PACKAGE_VERSION "1.3" CACHE STRING "Package version" FORCE)
+SET(GLOBAL_VERSION "1.3" CACHE STRING "Global version" FORCE)
+SET(VERSION "1.3" CACHE STRING "Version" FORCE)
 ##########################################################################################################################################
 
 
diff --git a/trunk/paradiseo-peo/src/core/eoVector_mesg.h b/trunk/paradiseo-peo/src/core/eoVector_mesg.h
index 094f39a34..7ac61d4aa 100644
--- a/trunk/paradiseo-peo/src/core/eoVector_mesg.h
+++ b/trunk/paradiseo-peo/src/core/eoVector_mesg.h
@@ -156,54 +156,9 @@ template <class Traits, class Type> void unpack (moeoObjectiveVector<Traits,Type
         unpack (_objVec[i]);
 }
 
-//template <class ObjectiveVector, class Fitness, class Diversity, class Type> void unpack(moeoVector <ObjectiveVector, Fitness, Diversity, Type> & _v)
-//{
-//  unsigned int valid;
-//  unsigned len;
-////   unpack(valid);
-////   if (! valid)
-////     _v.invalidateFitness();
-////   else
-////     {
-////       Fitness fit;
-////       unpack (fit);
-////  std::cerr << "fit = " << fit << std::endl;
-////       _v.fitness (fit);
-////     }
-//
-//  //Unpack fitness and diversity
-//
-////   unpack(valid);
-////   if (! valid)
-////     _v.invalidateDiversity();
-////   else
-////     {
-////       V diver;
-////       unpack(diver);
-////       _v.diversity(diver);
-////     }
-//  //Unpack Objective Vector
-// unpack(valid);
-//  if (! valid)
-//     _v.invalidateObjectiveVector();
-//   else
-//     {
-//       unpack(_v.objectiveVector());
-//    }
-//  unpack (len);
-//  _v.resize (len);
-//  for (unsigned i = 0 ; i < len; i ++)
-//    unpack (_v [i]);
-//}
-
-
 
 template <class Traits, class Type> void pack (const moeoObjectiveVector<Traits,Type> & _objVec)
 {
-//       unsigned int len;
-     //typedef typename moeoVector<F,T,V,W>::ObjectiveVector ObjectiveVector;
-//       moeoObjectiveVector<F,W> object;
-//       object=_Ov;
       unsigned int len = _objVec.nObjectives();
       pack(len);
       for (unsigned i=0; i<len; i++)
@@ -211,38 +166,7 @@ template <class Traits, class Type> void pack (const moeoObjectiveVector<Traits,
 
 }
 
-//template <class ObjectiveVector, class Fitness, class Diversity, class Type> void pack(const moeoVector <ObjectiveVector, Fitness, Diversity, Type> & _v)
-//{
-//  unsigned int len;
-////Pack fitness : in comment but maybe useful in the future
-////    if (_v.invalidFitness())
-////      pack((unsigned int) 0);
-////    else
-////      {
-////        pack((unsigned int) 1);
-//// 	std::cerr << "FITENNESSS" << _v.fitness() << std::endl;
-////        pack (_v.fitness());
-////      }
-//// //Pack diversity
-////   if (_v.invalidDiversity())
-////     pack((unsigned)0);
-////   else
-////     {
-////       pack((unsigned)1);
-////       pack(_v.diversity());
-////     }
-//  if (_v.invalidObjectiveVector())
-//    pack((unsigned int) 0);
-//  else
-//  {
-//     pack((unsigned int) 1);
-//      pack(_v.objectiveVector());
-//  }
-//  len = _v.size ();
-//  pack (len);
-//  for (unsigned i = 0 ; i < len; i ++)
-//    pack (_v[i]);
-//}
+
 template <class F, class T, class V, class W> void pack (moeoVector <F,T,V,W> &_v)
 {
   if (_v.invalid())
@@ -317,81 +241,4 @@ template <class F, class T, class V, class W> void unpack (moeoVector <F,T,V,W>
     }
 }
 
-/*
-template <class F, class T, class V, class W> void unpack (moeoVector <F,T,V,W> &_v)
-{
-  unsigned valid;
-  unpack(valid);
-  if (! valid)
-    _v.invalidate();
-  else
-    {
-      T fit;
-      unpack (fit);
-      _v.fitness (fit);
-    }
-  unpack(valid);
-  if (! valid)
-    _v.invalidateDiversity();
-  else
-    {
-      V diver;
-      unpack(diver);
-      _v.diversity(diver);
-    }
-  unsigned len;
-  unpack (len);
-  _v.resize (len);
-  for (unsigned i = 0 ; i < len; i ++)
-    unpack (_v [i]);
-  unpack(valid);
-  if (! valid)
-    _v.invalidateObjectiveVector();
-  else
-    {
-      F object;
-      unpack (len);
-      object.resize(len);
-      for (unsigned i = 0 ; i < len; i ++)
-        unpack (object[i]);
-      _v.objectiveVector(object);
-    }
-}
-
-
-template <class F, class T, class V, class W> void pack (moeoVector <F,T,V,W> &_v)
-{
-  if (_v.invalid())
-    pack((unsigned)0);
-  else
-    {
-      pack((unsigned)1);
-      pack (_v.fitness ());
-    }
-  if (_v.invalidDiversity())
-    pack((unsigned)0);
-  else
-    {
-      pack((unsigned)1);
-      pack(_v.diversity());
-    }
-  unsigned len = _v.size ();
-  pack (len);
-  for (unsigned i = 0 ; i < len; i ++)
-    pack (_v[i]);
-  if (_v.invalidObjectiveVector())
-    pack((unsigned)0);
-  else
-    {
-      pack((unsigned)1);
-      F object;
-      object=_v.objectiveVector();
-      len=object.nObjectives();
-      pack (len);
-      for (unsigned i = 0 ; i < len; i ++)
-        pack (object[i]);
-    }
-}
-*/
-
 #endif