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

This commit is contained in:
boufaras 2011-07-08 12:47:13 +00:00
commit 790ba750ce

View file

@ -30,7 +30,7 @@
ParadisEO WebSite : http://paradiseo.gforge.inria.fr ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr Contact: paradiseo-help@lists.gforge.inria.fr
*/ */
#ifndef _bitNeighbor_h #ifndef _bitNeighbor_h
#define _bitNeighbor_h #define _bitNeighbor_h
@ -42,11 +42,11 @@
/** /**
* Neighbor related to a vector of Bit * Neighbor related to a vector of Bit
*/ */
template< class Fitness > emplate< class Fitness >
class moBitNeighbor : public moBackableNeighbor<eoBit<Fitness> >, public moIndexNeighbor<eoBit<Fitness> > class moBitNeighbor : public moBackableNeighbor<eoBit<Fitness> >, public moIndexNeighbor<eoBit<Fitness> >
{ {
public: public:
typedef eoBit<Fitness> EOT ; typedef eoBit<Fitness> EOT;
using moBackableNeighbor<EOT>::fitness; using moBackableNeighbor<EOT>::fitness;
using moIndexNeighbor<EOT>::key; using moIndexNeighbor<EOT>::key;
@ -90,9 +90,8 @@ public:
_is >> fitness_str; _is >> fitness_str;
if (fitness_str == "INVALID") { if (fitness_str == "INVALID") {
throw std::runtime_error("invalid fitness"); throw std::runtime_error("invalid fitness");
} } else {
else { Fitness repFit;
Fitness repFit ;
_is.seekg(pos); _is.seekg(pos);
_is >> repFit; _is >> repFit;
_is >> key; _is >> key;