eoInvertedContinue + minor modifications
This commit is contained in:
parent
0f1add5c6a
commit
b30e0a9695
3 changed files with 64 additions and 3 deletions
62
eo/src/eoInvertedContinue.h
Normal file
62
eo/src/eoInvertedContinue.h
Normal file
|
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
<eoInvertedContinue.h>
|
||||||
|
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 <eoContinue.h>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the opposite of the wrapped continuator
|
||||||
|
*
|
||||||
|
* @ingroup Continuators
|
||||||
|
*/
|
||||||
|
template< class EOT>
|
||||||
|
class eoInvertedContinue: public eoContinue<EOT>
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/// Ctor
|
||||||
|
eoInvertedContinue(eoContinue<EOT>& _cont)
|
||||||
|
: cont(_cont) {};
|
||||||
|
|
||||||
|
/** Returns the opposite of the wrapped continuator
|
||||||
|
*/
|
||||||
|
virtual bool operator() ( const eoPop<EOT>& _pop )
|
||||||
|
{
|
||||||
|
return !cont(_pop);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual std::string className(void) const { return "eoInvertedContinue"; }
|
||||||
|
|
||||||
|
private:
|
||||||
|
eoContinue<EOT> &eval;
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -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 A and B with pointers.
|
||||||
|
|
||||||
**/
|
**/
|
||||||
template<class A, class B>
|
|
||||||
|
template<class A, class B>
|
||||||
class Bimap
|
class Bimap
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,6 @@ template<class EOT>
|
||||||
void paradiseo::smp::IslandModel<EOT>::update(eoPop<EOT> _data, AIsland<EOT>* _island)
|
void paradiseo::smp::IslandModel<EOT>::update(eoPop<EOT> _data, AIsland<EOT>* _island)
|
||||||
{
|
{
|
||||||
std::lock_guard<std::mutex> lock(m);
|
std::lock_guard<std::mutex> lock(m);
|
||||||
//std::cout << "Mediateur reçoit ! " << _data << std::endl;
|
|
||||||
listEmigrants.push(std::pair<eoPop<EOT>,AIsland<EOT>*>(_data, _island));
|
listEmigrants.push(std::pair<eoPop<EOT>,AIsland<EOT>*>(_data, _island));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -145,7 +144,6 @@ void paradiseo::smp::IslandModel<EOT>::send(void)
|
||||||
std::lock_guard<std::mutex> lock(m);
|
std::lock_guard<std::mutex> lock(m);
|
||||||
if (!listEmigrants.empty())
|
if (!listEmigrants.empty())
|
||||||
{
|
{
|
||||||
//std::cout << "Mediator envoie ! " << listEmigrants.size() << std::endl;
|
|
||||||
// Get the neighbors
|
// Get the neighbors
|
||||||
unsigned idFrom = table.getLeft()[listEmigrants.front().second];
|
unsigned idFrom = table.getLeft()[listEmigrants.front().second];
|
||||||
std::vector<unsigned> neighbors = topo.getIdNeighbors(idFrom);
|
std::vector<unsigned> neighbors = topo.getIdNeighbors(idFrom);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue