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

Add a builder attribute to the topology and construct method

Browse source
This commit is contained in:
lasnier 2012-11-20 16:53:28 +01:00
commit 631d693bef
8 changed files with 86 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
smp/src/topology/abstractTopology.h
View file

@ -38,7 +38,7 @@ namespace smp
class AbstractTopology
{
public :
virtual std::vector<unsigned> getIdNeighbours(unsigned idIsland) const =0;
virtual std::vector<unsigned> getIdNeighbors(unsigned idIsland) const =0;
};
}

2
smp/src/topology/complete.cpp
View file

@ -38,4 +38,4 @@ void paradiseo::smp::Complete::operator()(unsigned nbIsland, std::vector<std::ve
matrix.assign(nbIsland, line);
for(int i=0;i<nbIsland;i++)
matrix[i][i]=false;
}
}

1
smp/src/topology/ring.cpp
View file

@ -28,7 +28,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
*/
#include <vector>
#include <topology/topologyBuilder.h>
#include <topology/ring.h>
void paradiseo::smp::Ring::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const

1
smp/src/topology/star.cpp
View file

@ -28,7 +28,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
*/
#include <vector>
#include <topology/topologyBuilder.h>
#include <topology/star.h>
void paradiseo::smp::Star::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const

20
smp/src/topology/topology.cpp
View file

@ -30,18 +30,18 @@ Contact: paradiseo-help@lists.gforge.inria.fr
#include <vector>
template <class TopologyType>
paradiseo::smp::Topology<TopologyType>::Topology(unsigned nbIsland)
{
TopologyType builder;
builder(nbIsland, _matrix);
}
template <class TopologyType>
std::vector<unsigned> paradiseo::smp::Topology<TopologyType>::getIdNeighbours(unsigned idIsland) const
std::vector<unsigned> paradiseo::smp::Topology<TopologyType>::getIdNeighbors(unsigned idIsland) const
{
std::vector<unsigned> neighbours;
std::vector<unsigned> neighbors;
for(unsigned j=0; j<_matrix.size();j++)
if(_matrix[idIsland][j]) neighbours.push_back(j);
if(_matrix[idIsland][j]) neighbors.push_back(j);
return neighbours;
return neighbors;
}
template <class TopologyType>
void paradiseo::smp::Topology<TopologyType>::construct(unsigned nbIsland)
{
_builder(nbIsland, _matrix);
}

6
smp/src/topology/topology.h
View file

@ -40,9 +40,9 @@ class Topology : public AbstractTopology
{
public :
Topology(unsigned nbIsland);
std::vector<unsigned> getIdNeighbours(unsigned idIsland) const;
Topology() = default;
std::vector<unsigned> getIdNeighbors(unsigned idIsland) const;
void construct(unsigned nbIsland);
private :
TopologyType _builder;

2
smp/test/CMakeLists.txt
View file

@ -17,7 +17,7 @@ set (TEST_LIST
t-smpMW_eoEasyPSO
t-smpMW_eoSyncEasyPSO
t-smpIsland
t-smpTopo)
t-smpTopo)
######################################################################################
### 3) Create each test

70
smp/test/t-smpTopo.cpp Normal file
View file

@ -0,0 +1,70 @@
#include <topology/topology.h>
#include <topology/complete.h>
#include <topology/star.h>
#include <topology/ring.h>
#include <iostream>
#include <vector>
using namespace paradiseo::smp;
int main()
{
//Test of Complete Topology
Topology<Complete> topo_comp;
topo_comp.construct(5);
std::cout << std::endl << "---------------" << std::endl << "Test of Complete Topology" << std::endl;
std::vector<unsigned> neighbors=topo_comp.getIdNeighbors(1);
std::cout << "neighbors of Island 1 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
neighbors=topo_comp.getIdNeighbors(2);
std::cout <<std::endl << "Neighbors of Island 2 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
//Test of Star Topology
Topology<Star> topo_star;
topo_star.construct(4);
std::cout << std::endl << "---------------" << std::endl << "Test of Star Topology" << std::endl;
neighbors=topo_star.getIdNeighbors(0);
std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_star.getIdNeighbors(1);
std::cout <<std::endl << "Neighbors of Island 1 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
//Test of Ring Topology
Topology<Ring> topo_ring;
topo_ring.construct(8);
std::cout << std::endl << "---------------" << std::endl << "Test of Ring Topology" << std::endl;
neighbors=topo_ring.getIdNeighbors(4);
std::cout <<std::endl << "Neighbors of Island 4 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_ring.getIdNeighbors(7);
std::cout <<std::endl << "Neighbors of Island 7 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
neighbors=topo_ring.getIdNeighbors(0);
std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
for (int i=0; i < neighbors.size(); i++)
std::cout << " " << neighbors[i];
std::cout << std::endl;
}