From 8f4b8feb9436de5e01e7fefbd58e50cc8826bc1b Mon Sep 17 00:00:00 2001 From: lasnier Date: Sat, 17 Nov 2012 17:13:31 +0100 Subject: [PATCH] Add complete, star and ring topologies --- smp/src/CMakeLists.txt | 3 ++ smp/src/topology/completeTopologyBuilder.cpp | 41 ++++++++++++++++ smp/src/topology/completeTopologyBuilder.h | 50 +++++++++++++++++++ smp/src/topology/ringTopologyBuilder.cpp | 43 +++++++++++++++++ smp/src/topology/ringTopologyBuilder.h | 51 ++++++++++++++++++++ smp/src/topology/starTopologyBuilder.cpp | 46 ++++++++++++++++++ smp/src/topology/starTopologyBuilder.h | 51 ++++++++++++++++++++ smp/test/CMakeLists.txt | 2 +- 8 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 smp/src/topology/completeTopologyBuilder.cpp create mode 100644 smp/src/topology/completeTopologyBuilder.h create mode 100644 smp/src/topology/ringTopologyBuilder.cpp create mode 100644 smp/src/topology/ringTopologyBuilder.h create mode 100644 smp/src/topology/starTopologyBuilder.cpp create mode 100644 smp/src/topology/starTopologyBuilder.h diff --git a/smp/src/CMakeLists.txt b/smp/src/CMakeLists.txt index bd32afd05..500869899 100644 --- a/smp/src/CMakeLists.txt +++ b/smp/src/CMakeLists.txt @@ -23,6 +23,9 @@ set (SMP_FILE topology/abstractTopology.h topology/booleanTopology.h topology/topologyBuilder.h + topology/completeTopologyBuilder.cpp + topology/starTopologyBuilder.cpp + topology/ringTopologyBuilder.cpp ) add_library(smp STATIC ${SMP_FILE}) diff --git a/smp/src/topology/completeTopologyBuilder.cpp b/smp/src/topology/completeTopologyBuilder.cpp new file mode 100644 index 000000000..18556a184 --- /dev/null +++ b/smp/src/topology/completeTopologyBuilder.cpp @@ -0,0 +1,41 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 +*/ + +#include +#include + +void paradiseo::smp::CompleteTopologyBuilder::operator()(unsigned nbIsland, std::vector>& matrix) const +{ + matrix.clear(); + std::vector line; + line.assign(nbIsland,true); + matrix.assign(nbIsland, line); + for(int i=0;i +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 COMPLETE_TOPO_BUILDER_H_ +#define COMPLETE_TOPO_BUILDER_H_ + +#include +#include + +namespace paradiseo +{ +namespace smp +{ + +class CompleteTopologyBuilder: public TopologyBuilder +{ +public : + void operator()(unsigned nbIsland, std::vector>& matrix) const; +}; + +} + +} + +#endif diff --git a/smp/src/topology/ringTopologyBuilder.cpp b/smp/src/topology/ringTopologyBuilder.cpp new file mode 100644 index 000000000..ad21d51f2 --- /dev/null +++ b/smp/src/topology/ringTopologyBuilder.cpp @@ -0,0 +1,43 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 +*/ + +#include +#include +#include + +void paradiseo::smp::RingTopologyBuilder::operator()(unsigned nbIsland, std::vector>& matrix) const +{ + matrix.clear(); + std::vector line; + line.assign(nbIsland, false); + matrix.assign(nbIsland, line); + + for(int i=0; i +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 RING_TOPO_BUILDER_H_ +#define RING_TOPO_BUILDER_H_ + +#include +#include + +namespace paradiseo +{ +namespace smp +{ + +class RingTopologyBuilder : public TopologyBuilder +{ +public : + void operator()(unsigned nbIsland, std::vector>& matrix) const; +}; + +} + +} + +#endif diff --git a/smp/src/topology/starTopologyBuilder.cpp b/smp/src/topology/starTopologyBuilder.cpp new file mode 100644 index 000000000..a2c723289 --- /dev/null +++ b/smp/src/topology/starTopologyBuilder.cpp @@ -0,0 +1,46 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 +*/ + +#include +#include +#include + +void paradiseo::smp::StarTopologyBuilder::operator()(unsigned nbIsland, std::vector>& matrix) const +{ + matrix.clear(); + std::vector line (nbIsland,false); + + line[0]=true; + matrix.assign(nbIsland-1,line); + + line.clear(); + line.assign(nbIsland, false); + std::vector>::iterator it = matrix.begin(); + matrix.insert(it, line); +} diff --git a/smp/src/topology/starTopologyBuilder.h b/smp/src/topology/starTopologyBuilder.h new file mode 100644 index 000000000..c00e4d373 --- /dev/null +++ b/smp/src/topology/starTopologyBuilder.h @@ -0,0 +1,51 @@ +/* + +Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012 + +Alexandre Quemy, Thibault Lasnier - INSA Rouen + +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 STAR_TOPO_BUILDER_H_ +#define STAR_TOPO_BUILDER_H_ + +#include +#include + +namespace paradiseo +{ +namespace smp +{ + +class StarTopologyBuilder : public TopologyBuilder +{ +public : + void operator()(unsigned nbIsland, std::vector>& matrix) const; +}; + +} + +} + +#endif diff --git a/smp/test/CMakeLists.txt b/smp/test/CMakeLists.txt index 8630d7b55..9e904f991 100644 --- a/smp/test/CMakeLists.txt +++ b/smp/test/CMakeLists.txt @@ -17,7 +17,7 @@ set (TEST_LIST t-smpMW_eoEasyPSO t-smpMW_eoSyncEasyPSO t-smpIsland - ) + t-smpTopo) ###################################################################################### ### 3) Create each test