From 631d693bef58b63c880529291c596787363f02de Mon Sep 17 00:00:00 2001
From: lasnier <thibault.lasnier@insa-rouen.fr>
Date: Tue, 20 Nov 2012 16:53:28 +0100
Subject: [PATCH] Add a builder attribute to the topology and construct method

---
 smp/src/topology/abstractTopology.h |  2 +-
 smp/src/topology/complete.cpp       |  2 +-
 smp/src/topology/ring.cpp           |  1 -
 smp/src/topology/star.cpp           |  1 -
 smp/src/topology/topology.cpp       | 20 ++++-----
 smp/src/topology/topology.h         |  6 +--
 smp/test/CMakeLists.txt             |  2 +-
 smp/test/t-smpTopo.cpp              | 70 +++++++++++++++++++++++++++++
 8 files changed, 86 insertions(+), 18 deletions(-)
 create mode 100644 smp/test/t-smpTopo.cpp

diff --git a/smp/src/topology/abstractTopology.h b/smp/src/topology/abstractTopology.h
index 61717bcd7..153573e9b 100644
--- a/smp/src/topology/abstractTopology.h
+++ b/smp/src/topology/abstractTopology.h
@@ -38,7 +38,7 @@ namespace smp
 class AbstractTopology
 {
 public :
-	virtual std::vector<unsigned> getIdNeighbours(unsigned idIsland) const =0;
+	virtual std::vector<unsigned> getIdNeighbors(unsigned idIsland) const =0;
 };
 
 }
diff --git a/smp/src/topology/complete.cpp b/smp/src/topology/complete.cpp
index 0f769b22b..f52c2ab5d 100644
--- a/smp/src/topology/complete.cpp
+++ b/smp/src/topology/complete.cpp
@@ -38,4 +38,4 @@ void paradiseo::smp::Complete::operator()(unsigned nbIsland, std::vector<std::ve
     matrix.assign(nbIsland, line);
     for(int i=0;i<nbIsland;i++)
         matrix[i][i]=false;
-}		
+}
diff --git a/smp/src/topology/ring.cpp b/smp/src/topology/ring.cpp
index 30fc4d4d2..269a77ed3 100644
--- a/smp/src/topology/ring.cpp
+++ b/smp/src/topology/ring.cpp
@@ -28,7 +28,6 @@ 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
diff --git a/smp/src/topology/star.cpp b/smp/src/topology/star.cpp
index 33bcf0b9d..e6d9cc389 100644
--- a/smp/src/topology/star.cpp
+++ b/smp/src/topology/star.cpp
@@ -28,7 +28,6 @@ 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
diff --git a/smp/src/topology/topology.cpp b/smp/src/topology/topology.cpp
index 02995d11b..f40298566 100644
--- a/smp/src/topology/topology.cpp
+++ b/smp/src/topology/topology.cpp
@@ -30,18 +30,18 @@ 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> paradiseo::smp::Topology<TopologyType>::getIdNeighbors(unsigned idIsland) const
 {
-	std::vector<unsigned> neighbours;
+	std::vector<unsigned> neighbors;
 	for(unsigned j=0; j<_matrix.size();j++)
-		if(_matrix[idIsland][j]) neighbours.push_back(j);
+		if(_matrix[idIsland][j]) neighbors.push_back(j);
 		
-	return neighbours;
+	return neighbors;
+}
+
+template <class TopologyType>
+void paradiseo::smp::Topology<TopologyType>::construct(unsigned nbIsland)
+{
+    _builder(nbIsland, _matrix);
 }
diff --git a/smp/src/topology/topology.h b/smp/src/topology/topology.h
index 8b3b290aa..15df0321f 100644
--- a/smp/src/topology/topology.h
+++ b/smp/src/topology/topology.h
@@ -40,9 +40,9 @@ class Topology : public AbstractTopology
 {
 
 public :
-	Topology(unsigned nbIsland);
-
-	std::vector<unsigned> getIdNeighbours(unsigned idIsland) const;
+	Topology() = default;
+	std::vector<unsigned> getIdNeighbors(unsigned idIsland) const;
+	void construct(unsigned nbIsland);
 	
 private :
     TopologyType _builder;
diff --git a/smp/test/CMakeLists.txt b/smp/test/CMakeLists.txt
index 9e904f991..59fb57a6c 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)
+        t-smpTopo)
 
 ######################################################################################
 ### 3) Create each test
diff --git a/smp/test/t-smpTopo.cpp b/smp/test/t-smpTopo.cpp
new file mode 100644
index 000000000..0d6101358
--- /dev/null
+++ b/smp/test/t-smpTopo.cpp
@@ -0,0 +1,70 @@
+#include <topology/topology.h>
+#include <topology/complete.h>
+#include <topology/star.h>
+#include <topology/ring.h>
+#include <iostream>
+#include <vector>
+
+using namespace paradiseo::smp;
+
+int main()
+{
+	//Test of Complete Topology
+	Topology<Complete> topo_comp;
+	topo_comp.construct(5);
+	
+    std::cout << std::endl << "---------------" << std::endl << "Test of Complete Topology" << std::endl;
+    
+	std::vector<unsigned> neighbors=topo_comp.getIdNeighbors(1);
+	std::cout << "neighbors of Island 1 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+			
+	neighbors=topo_comp.getIdNeighbors(2);
+	std::cout <<std::endl << "Neighbors of Island 2 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;
+	
+	//Test of Star Topology
+	Topology<Star> topo_star;
+	topo_star.construct(4);
+
+    std::cout << std::endl << "---------------" << std::endl << "Test of Star Topology" << std::endl;   
+    
+	neighbors=topo_star.getIdNeighbors(0);
+	std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;
+
+	neighbors=topo_star.getIdNeighbors(1);
+	std::cout <<std::endl << "Neighbors of Island 1 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;
+
+	//Test of Ring Topology
+	Topology<Ring> topo_ring;
+	topo_ring.construct(8);
+
+    std::cout << std::endl << "---------------" << std::endl << "Test of Ring Topology" << std::endl;    
+
+	neighbors=topo_ring.getIdNeighbors(4);
+	std::cout <<std::endl << "Neighbors of Island 4 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;
+
+	neighbors=topo_ring.getIdNeighbors(7);
+	std::cout <<std::endl << "Neighbors of Island 7 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;
+	
+	neighbors=topo_ring.getIdNeighbors(0);
+	std::cout <<std::endl << "Neighbors of Island 0 : "<<std::endl;
+	for (int i=0; i < neighbors.size(); i++)
+		std::cout << " " << neighbors[i];
+	std::cout << std::endl;    
+}