Added mesh to build file, corrected class names for topology helpers

diff --git a/code/src/topology/helper/cube.cc b/code/src/topology/helper/cube.cc
index 58e5b4ca18b883fedf9036b8495947ae4346e53e..44644fcd0890d977cc4224e5762bfdc3ca8e875f 100644 (file)
--- a/code/src/topology/helper/cube.cc
+++ b/code/src/topology/helper/cube.cc
@@ -21,11 +21,11 @@
 #include "cube.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Cube_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("CubeTopologyHelper");
 
 namespace ns3 {
 
-Topology Cube_Topology_Helper::Create(long hosts, long size){
+Topology CubeTopologyHelper::Create(long hosts, long size){
 
        Topology t;
 

diff --git a/code/src/topology/helper/cube.h b/code/src/topology/helper/cube.h
index aad371f8bcd374506780bbac1c271634bb243f21..e7cfcc03d31345e10b83c5333116d8047b7dbe09 100644 (file)
--- a/code/src/topology/helper/cube.h
+++ b/code/src/topology/helper/cube.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Cube_Topology_Helper {
+class CubeTopologyHelper {
        
 public:
 
-       Topology Create(long hosts, long size); 
+       static Topology Create(long hosts, long size);  
 
 };
 

diff --git a/code/src/topology/helper/mesh.cc b/code/src/topology/helper/mesh.cc
index 016294751be457152f7a603412c28569858c87dc..c37151b3991ae3ac4293295a3ba0b5401a103c21 100644 (file)
--- a/code/src/topology/helper/mesh.cc
+++ b/code/src/topology/helper/mesh.cc
@@ -21,11 +21,11 @@
 #include "mesh.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Mesh_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("MeshTopologyHelper");
 
 namespace ns3 {
 
-Topology Mesh_Topology_Helper::Create(long hosts, long size){
+Topology MeshTopologyHelper::Create(long hosts, long size){
 
        Topology t;
 

diff --git a/code/src/topology/helper/mesh.h b/code/src/topology/helper/mesh.h
index c318929cf09e61e6908aecf2ad19c72d2958ed5f..640824882a162777581b4f731adf6cb77a7fd5d6 100644 (file)
--- a/code/src/topology/helper/mesh.h
+++ b/code/src/topology/helper/mesh.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Mesh_Topology_Helper {
+class MeshTopologyHelper {
        
 public:
 
-       Topology Create(long hosts, long size); 
+       Topology static Create(long hosts, long size);  
 
 };
 

diff --git a/code/src/topology/helper/torus.cc b/code/src/topology/helper/torus.cc
index fc8214064889af1d26cf1f2c7423cc374b4fbef4..1f4f4f4edbb59d4855ceb9dfba28608160e55f98 100644 (file)
--- a/code/src/topology/helper/torus.cc
+++ b/code/src/topology/helper/torus.cc
@@ -21,11 +21,11 @@
 #include "torus.h"
 #include "ns3/log.h"
 
-NS_LOG_COMPONENT_DEFINE ("Torus_Topology_Helper");
+NS_LOG_COMPONENT_DEFINE ("TorusTopologyHelper");
 
 namespace ns3 {
 
-Topology Torus_Topology_Helper::Create(long hosts, long size){
+Topology TorusTopologyHelper::Create(long hosts, long size){
 
        Topology t;
 

diff --git a/code/src/topology/helper/torus.h b/code/src/topology/helper/torus.h
index 2f00d9f2bd9a6ec81e937315ad0144384ce92cf0..29db816b6adaabb4ee16fe13374661423b2d46ce 100644 (file)
--- a/code/src/topology/helper/torus.h
+++ b/code/src/topology/helper/torus.h
@@ -25,11 +25,11 @@
 
 namespace ns3 {
 
-class Torus_Topology_Helper {
+class TorusTopologyHelper {
        
 public:
 
-       Topology Create(long hosts, long size); 
+       Topology static Create(long hosts, long size);  
 
 };
 

diff --git a/code/src/topology/wscript b/code/src/topology/wscript
index 2306f2df5497df19e75c4a9364c6f43ad1aef2b4..63c65de1be2c4397d9e0e1ce8891db8ef3c51997 100644 (file)
--- a/code/src/topology/wscript
+++ b/code/src/topology/wscript
@@ -5,13 +5,15 @@ def build(bld):
     obj.source = [
        'model/topology.cc',
        'helper/cube.cc',
-       'helper/torus.cc'
+       'helper/torus.cc',
+       'helper/mesh.cc'
         ]
     headers = bld.new_task_gen('ns3header')
     headers.module = 'topology'
     headers.source = [
        'model/topology.h',
        'helper/cube.h',
-       'helper/torus.h'
+       'helper/torus.h',
+       'helper/mesh.h'
         ]