Add abstract ad boolean topologies

smp/src/CMakeLists.txt

@@ -19,7 +19,11 @@ set (SMP_FILE
     thread.cpp
     MWModel.h
     scheduler.h
-    island.h)
+    island.h
+    topology/abstractTopology.h
+    topology/booleanTopology.h
+    topology/topologyBuilder.h
+    )
 
 add_library(smp STATIC ${SMP_FILE})
 

smp/src/topology/abstractTopology.h

@@ -0,0 +1,46 @@
+/*
+<abstractTopology.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>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+class AbstractTopology
+{
+public :
+	virtual std::vector<unsigned> getIdNeighbours(unsigned idIsland) const =0;
+};
+
+}
+
+}

smp/src/topology/booleanTopology.cpp

@@ -0,0 +1,47 @@
+/*
+<booleanTopology.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::BooleanTopology<TopologyType>::BooleanTopology(unsigned nbIsland)
+{
+	TopologyType builder;
+	builder(nbIsland, _matrix);
+}
+template <class TopologyType>	
+std::vector<unsigned> paradiseo::smp::BooleanTopology<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/booleanTopology.h

@@ -0,0 +1,55 @@
+/*
+<booleanTopology.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 T>
+class BooleanTopology : public AbstractTopology
+{
+
+public :
+	BooleanTopology(unsigned nbIsland);
+
+	std::vector<unsigned> getIdNeighbours(unsigned idIsland) const;
+	
+private :
+	std::vector<std::vector<bool>> _matrix;
+};
+
+#include<topology/booleanTopology.cpp>
+
+}
+
+}

smp/src/topology/topologyBuilder.h

@@ -0,0 +1,50 @@
+/*
+<abstractIsland.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 TOPO_BUILDER_H_
+#define TOPO_BUILDER_H_
+
+#include <vector>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+class TopologyBuilder
+{
+public :
+	virtual void operator()(unsigned _nbIsland, std::vector<std::vector<bool>>& _matrix) const = 0;
+};
+
+}
+
+}
+
+#endif