From 9b4637706207eedb84dc517c1a9a33659eeae5a1 Mon Sep 17 00:00:00 2001
From: lasnier <thibault.lasnier@insa-rouen.fr>
Date: Tue, 4 Dec 2012 17:40:00 +0100
Subject: [PATCH] Minor modification for documentation and not changing
 topology if not necessary

---
 smp/src/topology/complete.cpp   | 21 ++++++++-------
 smp/src/topology/complete.h     |  2 +-
 smp/src/topology/hypercubic.cpp | 45 ++++++++++++++++++---------------
 smp/src/topology/ring.cpp       | 21 ++++++++-------
 smp/src/topology/ring.h         |  2 +-
 5 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/smp/src/topology/complete.cpp b/smp/src/topology/complete.cpp
index 19cd2b4a5..aa019c628 100644
--- a/smp/src/topology/complete.cpp
+++ b/smp/src/topology/complete.cpp
@@ -32,15 +32,18 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 void paradiseo::smp::Complete::operator()(unsigned nbNode, std::vector<std::vector<bool>>& matrix) const
 {
-	matrix.clear();
+	if(nbNode!=matrix.size())
+	{
+	    matrix.clear();
 
-	matrix.resize(nbNode);
-	for(auto& line : matrix)
-	    line.resize(nbNode);
+	    matrix.resize(nbNode);
+	    for(auto& line : matrix)
+	        line.resize(nbNode);
 
-	std::vector<bool> line;
-	line.assign(nbNode,true);
-    matrix.assign(nbNode, line);
-    for(int i=0;i<nbNode;i++)
-        matrix[i][i]=false;
+	    std::vector<bool> line;
+	    line.assign(nbNode,true);
+        matrix.assign(nbNode, line);
+        for(int i=0;i<nbNode;i++)
+            matrix[i][i]=false;
+    }
 }
diff --git a/smp/src/topology/complete.h b/smp/src/topology/complete.h
index 0a2f54e5f..8ccf29ccf 100644
--- a/smp/src/topology/complete.h
+++ b/smp/src/topology/complete.h
@@ -38,7 +38,7 @@ namespace smp
 {
 
 /**
-*Complete: Inherit from TopologyBuilder. Reprents a builder for a complete topology : each node has every other node for neighor.
+*Complete: Inherit from TopologyBuilder. Represents a builder for a complete topology : each node has every other node for neighor.
 */
 class Complete: public TopologyBuilder
 {
diff --git a/smp/src/topology/hypercubic.cpp b/smp/src/topology/hypercubic.cpp
index 78f8a2cba..fcc179097 100644
--- a/smp/src/topology/hypercubic.cpp
+++ b/smp/src/topology/hypercubic.cpp
@@ -34,29 +34,32 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 void paradiseo::smp::Hypercubic::operator()(unsigned nbNode, std::vector<std::vector<bool>>& matrix) const
 {
-	//Check if the number of node is coherent with an hypercube
-	assert((nbNode & (nbNode-1)) == 0);
+	if(nbNode!=matrix.size())
+	{
+	    //Check if the number of node is coherent with an hypercube
+	    assert((nbNode & (nbNode-1)) == 0);
 
-	unsigned power=0,i,j;
-	while((nbNode & 1<<power) == 0)
-        power++;
-    
-	matrix.clear();
-	matrix.resize(nbNode);
+	    unsigned power=0,i,j;
+	    while((nbNode & 1<<power) == 0)
+            power++;
+        
+	    matrix.clear();
+	    matrix.resize(nbNode);
 	
-	for(auto& line : matrix)
-	    line.resize(nbNode);
+	    for(auto& line : matrix)
+	        line.resize(nbNode);
 
-    //Construction
-    matrix[0][0] = false;
-    for (unsigned dim = 1; dim <= power; dim ++)
-    {
-        int stepNbNode = 1<< (dim-1); //represents the number of nodes for the current step.
-        for(i=0; i <stepNbNode; i++)
-            for(j=0; j< stepNbNode;j++)
-            {
-                matrix[i+stepNbNode][j+stepNbNode]=matrix[i][j];//Diagonal part
-                matrix[i][j+stepNbNode]= matrix[i+stepNbNode][j] = (i == j);//Identity
-            }
+        //Construction
+        matrix[0][0] = false;
+        for (unsigned dim = 1; dim <= power; dim ++)
+        {
+            int stepNbNode = 1<< (dim-1); //represents the number of nodes for the current step.
+            for(i=0; i <stepNbNode; i++)
+                for(j=0; j< stepNbNode;j++)
+                {
+                    matrix[i+stepNbNode][j+stepNbNode]=matrix[i][j];//Diagonal part
+                    matrix[i][j+stepNbNode]= matrix[i+stepNbNode][j] = (i == j);//Identity
+                }
+        }
     }
 }
diff --git a/smp/src/topology/ring.cpp b/smp/src/topology/ring.cpp
index 37976e91c..d66279909 100644
--- a/smp/src/topology/ring.cpp
+++ b/smp/src/topology/ring.cpp
@@ -32,16 +32,19 @@ Contact: paradiseo-help@lists.gforge.inria.fr
 
 void paradiseo::smp::Ring::operator()(unsigned nbNode, std::vector<std::vector<bool>>& matrix) const
 {
-	matrix.clear();
+	if(nbNode!=matrix.size())
+	{
+	    matrix.clear();
 
-	matrix.resize(nbNode);
-	for(auto& line : matrix)
-	    line.resize(nbNode);
+	    matrix.resize(nbNode);
+	    for(auto& line : matrix)
+	        line.resize(nbNode);
 
-	std::vector<bool> line;
-	line.assign(nbNode, false);
-	matrix.assign(nbNode, line);
+	    std::vector<bool> line;
+	    line.assign(nbNode, false);
+	    matrix.assign(nbNode, line);
 	
-	for(int i=0; i<nbNode;i++)
-		matrix[i][(i+1)%nbNode]=true;
+	    for(int i=0; i<nbNode;i++)
+		    matrix[i][(i+1)%nbNode]=true;
+    }
 }	
diff --git a/smp/src/topology/ring.h b/smp/src/topology/ring.h
index b94944437..19d9b7919 100644
--- a/smp/src/topology/ring.h
+++ b/smp/src/topology/ring.h
@@ -39,7 +39,7 @@ namespace smp
 {
 
 /**
-*Ring: Inherit from TopologyBuilder. Reprents a builder for a complete topology : each node has the next node for neighor. The last node is connected to the first.
+*Ring: Inherit from TopologyBuilder. Represents a builder for a ring topology : each node has the next node for neighor. The last node is connected to the first.
 */
 class Ring : public TopologyBuilder
 {