nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixing peoPopEval< EOT > :: unpackResult() so that the compiler does not complain about a no matching call for unpack method. This

Browse source 
is always the case when using a non built-in c++ types.


git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@1463 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
fatene 2009-02-24 15:57:11 +00:00
commit e480a1c9dc
1 changed files with 70 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

74
trunk/paradiseo-peo/src/peoPopEval.h
View file

@ -39,6 +39,8 @@
#include <queue> #include <queue>
#include <eoEvalFunc.h> #include <eoEvalFunc.h>
#include <typeinfo>
#include <string.h>
#include "core/messaging.h" #include "core/messaging.h"
#include "core/peo_debug.h" #include "core/peo_debug.h"
@ -217,10 +219,74 @@ template< class EOT > void peoPopEval< EOT > :: packResult()
template< class EOT > void peoPopEval< EOT > :: unpackResult() template< class EOT > void peoPopEval< EOT > :: unpackResult()
{ {
typename EOT :: Fitness fit; typename EOT :: Fitness fit;
/* Built in types : int, short, long int, long long int,
/* Unpacking the computed fitness */ * unsigned int, unsigend short, unsigned long int, unsigned long long int,
unpack( fit ); * float, double, long double
*/
char types [11] = {'i','s','l','x','j','t','m','y', 'f', 'd','e'};
const char* type = typeid(fit).name();
int length = strlen(type);
int position = 18;
if ( length == 1)
{
position = 0;
length = 2;
}
if ( length > 1 && position < length)
{
if ( type[position] == types[0])
{
int __fit; unpack( __fit );fit = __fit;
}
if ( type[position] == types[1])
{
short int __fit; unpack( __fit );fit = __fit;
}
if ( type[position] == types[2])
{
long int __fit; unpack( __fit );fit = __fit;
}
/*
if ( type[position] == types[3])
{
long long int __fit; unpack( __fit );fit = __fit;
}
* */
if ( type[position] == types[4])
{
unsigned int __fit; unpack( __fit );fit = __fit;
}
if ( type[position] == types[5])
{
unsigned short __fit; unpack( __fit );fit = __fit;
}
if ( type[position] == types[6])
{
unsigned long __fit; unpack( __fit );fit = __fit;
}
/*
if ( type[position] == types[7])
{
unsigned long long __fit; unpack( __fit );fit = __fit;
}
*/
if ( type[position] == types[8])
{
float __fit; unpack( __fit );fit = __fit;
}
if ( type[position] == types[9])
{
double __fit; unpack( __fit );fit = __fit;
}
/*
if ( type[position] == types[10])
{
long double __fit; unpack( __fit );fit = __fit;
}
*/
}
/* Unpacking the @ of the associated individual */ /* Unpacking the @ of the associated individual */
unpack( ad_sol ); unpack( ad_sol );