Change class name for clarity

smp/src/CMakeLists.txt

@@ -21,11 +21,11 @@ set (SMP_FILE
     scheduler.h
     island.h
     topology/abstractTopology.h
-    topology/booleanTopology.h
+    topology/topology.h
     topology/topologyBuilder.h
-    topology/completeTopologyBuilder.cpp
-    topology/starTopologyBuilder.cpp
-    topology/ringTopologyBuilder.cpp
+    topology/complete.cpp
+    topology/star.cpp
+    topology/ring.cpp
     )
 
 add_library(smp STATIC ${SMP_FILE})

smp/src/topology/complete.cpp

@@ -0,0 +1,41 @@
+/*
+<complete.cpp>
+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 <topology/complete.h>
+#include <vector>
+
+void paradiseo::smp::Complete::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
+{
+	matrix.clear();
+	std::vector<bool> line;
+	line.assign(nbIsland,true);
+    matrix.assign(nbIsland, line);
+    for(int i=0;i<nbIsland;i++)
+        matrix[i][i]=false;
+}		

smp/src/topology/complete.h

@@ -0,0 +1,50 @@
+/*
+<completeTopologyBuilder.h>
+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_H_
+#define COMPLETE_H_
+
+#include <vector>
+#include <topology/topologyBuilder.h>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+class Complete: public TopologyBuilder
+{
+public :
+	void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
+};
+
+}
+
+}
+
+#endif

smp/src/topology/ring.cpp

@@ -0,0 +1,43 @@
+/*
+<ring.cpp>
+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 <vector>
+#include <topology/topologyBuilder.h>
+#include <topology/ring.h>
+
+void paradiseo::smp::Ring::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
+{
+	matrix.clear();
+	std::vector<bool> line;
+	line.assign(nbIsland, false);
+	matrix.assign(nbIsland, line);
+	
+	for(int i=0; i<nbIsland;i++)
+		matrix[i][(i+1)%nbIsland]=true;
+}	

smp/src/topology/ring.h

@@ -0,0 +1,51 @@
+/*
+<ring.h>
+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_H_
+#define RING_H_
+
+#include <vector>
+#include <topology/topologyBuilder.h>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+class Ring : public TopologyBuilder
+{
+public :
+	void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
+};
+
+}
+
+}
+
+#endif

smp/src/topology/star.cpp

@@ -0,0 +1,46 @@
+/*
+<star.cpp>
+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 <vector>
+#include <topology/topologyBuilder.h>
+#include <topology/star.h>
+
+void paradiseo::smp::Star::operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const
+{
+	matrix.clear();
+	std::vector<bool> line (nbIsland,false);
+
+	line[0]=true;
+	matrix.assign(nbIsland-1,line);
+	
+	line.clear();
+	line.assign(nbIsland, false);
+	std::vector<std::vector<bool>>::iterator it = matrix.begin();
+	matrix.insert(it, line);
+}

smp/src/topology/star.h

@@ -0,0 +1,51 @@
+/*
+<star.h>
+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_H_
+#define STAR_H_
+
+#include <vector>
+#include <topology/topologyBuilder.h>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+class Star : public TopologyBuilder
+{
+public :
+	void operator()(unsigned nbIsland, std::vector<std::vector<bool>>& matrix) const;
+};
+
+}
+
+}
+
+#endif

smp/src/topology/topology.cpp

@@ -0,0 +1,47 @@
+/*
+<topology.cpp>
+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 <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> neighbours;
+	for(unsigned j=0; j<_matrix.size();j++)
+		if(_matrix[idIsland][j]) neighbours.push_back(j);
+		
+	return neighbours;
+}

smp/src/topology/topology.h

@@ -0,0 +1,56 @@
+/*
+<topology.h>
+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 <vector>
+#include <topology/abstractTopology.h>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+template<class TopologyType>
+class Topology : public AbstractTopology
+{
+
+public :
+	Topology(unsigned nbIsland);
+
+	std::vector<unsigned> getIdNeighbours(unsigned idIsland) const;
+	
+private :
+    TopologyType _builder;
+	std::vector<std::vector<bool>> _matrix;
+};
+
+#include<topology/topology.cpp>
+
+}
+
+}