Cosmetics: sort topologies in source files.

diff --git a/deployment.cpp b/deployment.cpp
index 1b26a8afef13fe7c788f3a7624754e28fa0a405a..c5a1f9d40decaab7bc73e6f05e50c87bf6ca845a 100644 (file)
--- a/deployment.cpp
+++ b/deployment.cpp
@@ -64,33 +64,6 @@ void deployment_generator::deploy()
     xbt_dynar_free(&args);
 }
 
     xbt_dynar_free(&args);
 }
 

-void deployment_line::generate()
-{
-    for (unsigned i = 0 ; i < size() - 1 ; ++i)
-        set_link(i, i + 1);
-}
-
-void deployment_ring::generate()
-{
-    set_neighbor(0, size() - 1);
-    for (unsigned i = 0 ; i < size() - 1 ; ++i)
-        set_link(i, i + 1);
-    set_neighbor(size() - 1, 0);
-}
-
-void deployment_star::generate()
-{
-    for (unsigned i = 1 ; i < size() ; ++i)
-        set_link(0, i);
-}
-
-void deployment_clique::generate()
-{
-    for (unsigned i = 0 ; i < size() ; ++i)
-        for (unsigned j = 0 ; j < i ; ++j)
-            set_link(i, j);
-}
-

 void deployment_btree::generate()
 {
     for (unsigned i = 0 ; i < size() / 2 ; ++i) {
 void deployment_btree::generate()
 {
     for (unsigned i = 0 ; i < size() / 2 ; ++i) {


@@ -104,9 +77,12 @@ void deployment_btree::generate()
     }
 }
 
     }
 }
 

-// void deployment_torus::generate()
-// {
-// }
+void deployment_clique::generate()
+{
+    for (unsigned i = 0 ; i < size() ; ++i)
+        for (unsigned j = 0 ; j < i ; ++j)
+            set_link(i, j);
+}

 
 void deployment_hcube::generate()
 {
 
 void deployment_hcube::generate()
 {


@@ -125,3 +101,27 @@ void deployment_hcube::generate()
                 set_link(i, j);
         }
 }
                 set_link(i, j);
         }
 }

+
+void deployment_line::generate()
+{
+    for (unsigned i = 0 ; i < size() - 1 ; ++i)
+        set_link(i, i + 1);
+}
+
+void deployment_ring::generate()
+{
+    set_neighbor(0, size() - 1);
+    for (unsigned i = 0 ; i < size() - 1 ; ++i)
+        set_link(i, i + 1);
+    set_neighbor(size() - 1, 0);
+}
+
+void deployment_star::generate()
+{
+    for (unsigned i = 1 ; i < size() ; ++i)
+        set_link(0, i);
+}
+
+// void deployment_torus::generate()
+// {
+// }

diff --git a/deployment.h b/deployment.h
index 3cbe6ae367e98105c544fa2c263bad267a81ae64..2009b36c8a8d28e58f6823fc5a6bbe4378a8599b 100644 (file)
--- a/deployment.h
+++ b/deployment.h
@@ -31,13 +31,13 @@ private:
     public: void generate();                                    \
     }
 
     public: void generate();                                    \
     }
 

+DEPLOYMENT(btree);
+DEPLOYMENT(clique);
+DEPLOYMENT(hcube);

 DEPLOYMENT(line);
 DEPLOYMENT(ring);
 DEPLOYMENT(star);
 DEPLOYMENT(line);
 DEPLOYMENT(ring);
 DEPLOYMENT(star);

-DEPLOYMENT(clique);
-DEPLOYMENT(btree);

 // DEPLOYMENT(torus);
 // DEPLOYMENT(torus);

-DEPLOYMENT(hcube);

 
 #undef DEPLOYMENT
 
 
 #undef DEPLOYMENT
 

diff --git a/options.cpp b/options.cpp
index f881ad338e34d0990b365de58d2882087c775797..7a65a71864400bc1bf4c976cdcc2556aad4ec62d 100644 (file)
--- a/options.cpp
+++ b/options.cpp
@@ -52,16 +52,16 @@ namespace opt {
     topologies_type topologies;
     topologies_type::topologies_type()
     {
     topologies_type topologies;
     topologies_type::topologies_type()
     {

+        NOL_INSERT("btree", "binary tree topologym intiial load at root", 
+                   deployment_btree);
+        NOL_INSERT("clique", "all connected topology", deployment_clique);
+        NOL_INSERT("hcube", "hypercube topology", deployment_hcube);

         NOL_INSERT("line", "line topology, initial load at one end",
                    deployment_line);
         NOL_INSERT("ring", "ring topology", deployment_ring);
         NOL_INSERT("star", "star topology, initial load at center",
                    deployment_star);
         NOL_INSERT("line", "line topology, initial load at one end",
                    deployment_line);
         NOL_INSERT("ring", "ring topology", deployment_ring);
         NOL_INSERT("star", "star topology, initial load at center",
                    deployment_star);

-        NOL_INSERT("clique", "all connected topology", deployment_clique);
-        NOL_INSERT("btree", "binary tree topologym intiial load at root", 
-                   deployment_btree);

         // NOL_INSERT("torus", "torus topology", deployment_torus);
         // NOL_INSERT("torus", "torus topology", deployment_torus);

-        NOL_INSERT("hcube", "hypercube topology", deployment_hcube);

     }
 
 } // namespace opt
     }
 
 } // namespace opt