Adding Mesh Topology

smp/src/CMakeLists.txt

@@ -28,6 +28,7 @@ set (SMP_FILE
     topology/star.cpp
     topology/ring.cpp
     topology/hypercubic.cpp
+    topology/mesh.cpp
     )
 
 add_library(smp STATIC ${SMP_FILE})

smp/src/smp.h

@@ -46,5 +46,6 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 #include <topology/ring.h>
 #include <topology/star.h>
 #include <topology/hypercubic.h>
+#include <topology/mesh.cpp>
 
 #endif

smp/src/topology/mesh.cpp

@@ -0,0 +1,93 @@
+/*
+<mesh.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 <cmath>
+#include <topology/mesh.h>
+
+void paradiseo::smp::Mesh::operator()(unsigned nbNode, std::vector<std::vector<bool>>& matrix) const
+{
+    int i=0, j, height, width;
+    std::vector<unsigned> listFact = paradiseo::smp::Mesh::factorization(nbNode);
+    int nbFact = listFact.size();
+	    
+	//Compute width and height
+	//find the ratio height/width of the grid that matches best the variable _ratio
+	while (i<listFact.size()-1 && (double)listFact[i]*listFact[i]/nbNode<_ratio)
+	    i++;
+
+    /*
+    listFact[i] contains first factor which produces a ratio above the variable _ratio,
+    or the last element if there is no ratio that can go over the variable _ratio. 
+	*/
+	double r1 = (double)listFact[i]*listFact[i]/nbNode;
+	double r2 = (double)listFact[i-1]*listFact[i-1]/nbNode;
+	
+	//which ratio (r1,r2) matches _ratio best?
+    if (std::abs(r2-_ratio) <= _ratio-r1)
+        height = listFact[i-1];
+    else
+        height = listFact[i];
+    
+    width = nbNode/height;
+	
+	//Building matrix
+	matrix.clear();
+	
+	matrix.resize(nbNode);
+	for(auto& line : matrix)
+	    line.resize(nbNode);
+	    
+	for(i = 0; i < matrix.size(); i++)
+	{
+	    matrix[i][i]=false;
+	    for (j = i+1; j < matrix.size(); j++)
+	    {
+	        matrix[j][i] = matrix[i][j] = ((j-i == 1) && (j % width != 0)) || (j-i == width);
+	    }
+	}
+}
+
+void paradiseo::smp::Mesh::setRatio(double r)
+{
+    _ratio = r;
+}
+
+std::vector<unsigned> paradiseo::smp::Mesh::factorization(unsigned n) const
+{
+    unsigned i;
+    double max = std::sqrt(n+1);
+    std::vector<unsigned> listFact;
+    for(i=1; i < max; i++)
+    {
+        if((n/i)*i == n)
+            listFact.push_back(i);
+    }
+    return listFact;
+}

smp/src/topology/mesh.h

@@ -0,0 +1,70 @@
+/*
+<mesh.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 MESH_H_
+#define MESH_H_
+
+#include <vector>
+#include <topology/topologyBuilder.h>
+
+namespace paradiseo
+{
+namespace smp
+{
+
+/**
+*Mesh: Inherit from TopologyBuilder. Represents a builder for a mesh topology : nodes are organised over a rectangular grid, and each node is connected to : 2 nodes (corner), 3 nodes (edge) or 4 nodes (center). The default mesh has a ratio near 1 (square), but the user can change the ratio between 0 and 1 (line to square) 
+*/
+class Mesh : public TopologyBuilder
+{
+public :
+    /**
+    *Fills the given matrix for a mesh topology with the specified number of nodes.
+    */
+    void operator()(unsigned nbNode, std::vector<std::vector<bool>>& matrix) const;
+    
+    /**
+    *Setter for the variable _ratio
+    */
+    void setRatio(double r);
+    
+private :
+    /**
+    *Ratio of the grid, between 0 and 1 (default). The change will not be done before next construction of the topology.
+    */
+    double _ratio=1;
+    
+    std::vector<unsigned> factorization(unsigned n) const;
+};
+
+}
+
+}
+
+#endif

smp/test/t-smpTopo.cpp

@@ -81,12 +81,26 @@ int main()
 
     value.clear();
 	assert(neighbors == value);
-
+    //---------------------------------------
-	neighbors=topo_star.getIdNeighbors(1);
+	neighbors=topo_star.getIdNeighbors(2);
 	    
     value.clear();
 	value.push_back(0);
 	assert(neighbors == value);
+	//---------------------------------------
+	topo_star.getBuilder().setCenter(2);
+	topo_star.construct(n);
+
+	neighbors=topo_star.getIdNeighbors(0);    
+    
+    value.clear();
+    value.push_back(2);
+	assert(neighbors == value);
+    //---------------------------------------
+	neighbors=topo_star.getIdNeighbors(2);
+    value.clear();
+	assert(neighbors == value);
+	
 	
 /////////////////////////////////////////////////////////////////////////
 	//Test of Ring Topology
@@ -99,13 +113,13 @@ int main()
     value.clear();
 	value.push_back(5);
 	assert(neighbors == value);
-
+    //---------------------------------------
 	neighbors=topo_ring.getIdNeighbors(7);
     
     value.clear();
 	value.push_back(0);
 	assert(neighbors == value);
-	
+	//---------------------------------------
 	neighbors=topo_ring.getIdNeighbors(0);
 
     value.clear();
@@ -117,13 +131,13 @@ int main()
 	n=2;
 	Topology<Hypercubic> topo_hyper;
 	topo_hyper.construct(n);
-
+    
 	neighbors=topo_hyper.getIdNeighbors(0);
 	   
     value.clear();
 	value.push_back(1);
 	assert(neighbors == value);
-
+    //------------------------------------
     n=4;
    	topo_hyper.construct(n);
    	
@@ -133,7 +147,7 @@ int main()
 	value.push_back(0);
 	value.push_back(3);
 	assert(neighbors == value);
-   	
+   	//-------------------------------------
    	n=8;
    	topo_hyper.construct(n);
    	
@@ -144,4 +158,33 @@ int main()
 	value.push_back(4);
 	value.push_back(7);
 	assert(neighbors == value);
+	
+	/////////////////////////////////////////////////////////////////////////
+	//Test of Mesh Topology
+	n=9;
+	Topology<Mesh> topo_mesh;
+	topo_mesh.construct(n);
+	neighbors=topo_mesh.getIdNeighbors(0);
+    
+    value.clear();
+	value.push_back(1);
+	value.push_back(3);
+	assert(neighbors == value);
+	//-------------------------------------
+	topo_mesh.getBuilder().setRatio(0.4);
+	topo_mesh.construct(n);
+	neighbors=topo_mesh.getIdNeighbors(5);
+
+    value.clear();
+	value.push_back(6);
+	//assert(neighbors == value);	
+    //--------------------------------------
+	n=8;
+	topo_mesh.construct(n);
+	neighbors=topo_mesh.getIdNeighbors(0);
+	
+    value.clear();
+	value.push_back(1);
+	value.push_back(4);
+	assert(neighbors == value);        	
 }