diff --git a/eo/src/eoInvertedContinue.h b/eo/src/eoInvertedContinue.h new file mode 100644 index 000000000..0f677cc08 --- /dev/null +++ b/eo/src/eoInvertedContinue.h @@ -0,0 +1,62 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy + +This software is governed by the CeCILL license under French law and +abiding by the rules of distribution of free software. You can ue, +modify and/ or redistribute the software under the terms of the CeCILL +license as circulated by CEA, CNRS and INRIA at the following URL +"http://www.cecill.info". + +In this respect, the user's attention is drawn to the risks associated +with loading, using, modifying and/or developing or reproducing the +software by the user in light of its specific status of free software, +that may mean that it is complicated to manipulate, and that also +therefore means that it is reserved for developers and experienced +professionals having in-depth computer knowledge. Users are therefore +encouraged to load and test the software's suitability as regards their +requirements in conditions enabling the security of their systems and/or +data to be ensured and, more generally, to use and operate it in the +same conditions as regards security. +The fact that you are presently reading this means that you have had +knowledge of the CeCILL license and that you accept its terms. + +ParadisEO WebSite : http://paradiseo.gforge.inria.fr +Contact: paradiseo-help@lists.gforge.inria.fr +*/ + +#ifndef _eoInvertedContinue_h +#define _eoInvertedContinue_h + +#include + +/** + * Return the opposite of the wrapped continuator + * + * @ingroup Continuators +*/ +template< class EOT> +class eoInvertedContinue: public eoContinue +{ +public: + /// Ctor + eoInvertedContinue(eoContinue& _cont) + : cont(_cont) {}; + + /** Returns the opposite of the wrapped continuator + */ + virtual bool operator() ( const eoPop& _pop ) + { + return !cont(_pop); + } + + virtual std::string className(void) const { return "eoInvertedContinue"; } + +private: + eoContinue &eval; + +}; + +#endif diff --git a/smp/src/bimap.h b/smp/src/bimap.h index f914cc766..caf17f25e 100644 --- a/smp/src/bimap.h +++ b/smp/src/bimap.h @@ -43,7 +43,8 @@ A and B objects are stocked in two std::map, then if you would like to avoid ins template A and B with pointers. **/ - template + +template class Bimap { public: diff --git a/smp/src/islandModel.cpp b/smp/src/islandModel.cpp index 6baa6e0bc..4a9a27e65 100644 --- a/smp/src/islandModel.cpp +++ b/smp/src/islandModel.cpp @@ -118,7 +118,6 @@ template void paradiseo::smp::IslandModel::update(eoPop _data, AIsland* _island) { std::lock_guard lock(m); - //std::cout << "Mediateur reçoit ! " << _data << std::endl; listEmigrants.push(std::pair,AIsland*>(_data, _island)); } @@ -145,7 +144,6 @@ void paradiseo::smp::IslandModel::send(void) std::lock_guard lock(m); if (!listEmigrants.empty()) { - //std::cout << "Mediator envoie ! " << listEmigrants.size() << std::endl; // Get the neighbors unsigned idFrom = table.getLeft()[listEmigrants.front().second]; std::vector neighbors = topo.getIdNeighbors(idFrom);