Remove redundant includes.

[loba.git] / deployment.cpp

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()
+// {
+// }