Cosmetics: declare graph edges with the "right" direction.

diff --git a/src/kernel/routing/StarZone.cpp b/src/kernel/routing/StarZone.cpp
index 16b7262..aab5ccd 100644 (file)
--- a/src/kernel/routing/StarZone.cpp
+++ b/src/kernel/routing/StarZone.cpp
@@ -75,10 +75,10 @@ void StarZone::get_graph(const s_xbt_graph_t* graph, std::map<std::string, xbt_n
     previous = star_node;
     for (auto const* link : routes_[src->id()].links_down) {
       xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes);
     previous = star_node;
     for (auto const* link : routes_[src->id()].links_down) {
       xbt_node_t current = new_xbt_graph_node(graph, link->get_cname(), nodes);

-      new_xbt_graph_edge(graph, current, previous, edges);
+      new_xbt_graph_edge(graph, previous, current, edges);

       previous = current;
     }
       previous = current;
     }

-    new_xbt_graph_edge(graph, src_node, previous, edges);
+    new_xbt_graph_edge(graph, previous, src_node, edges);

   }
 }
 
   }
 }
 

diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh
index a33759b..928b6ab 100644 (file)
--- a/tools/graphicator/graphicator.tesh
+++ b/tools/graphicator/graphicator.tesh
@@ -27,25 +27,25 @@ $ cat test.dot
 >   "bob_cluster_link_6_DOWN";
 >   "bob_cluster_link_6_UP";
 >   "bobbob_cluster_router.hamburger.edu";
 >   "bob_cluster_link_6_DOWN";
 >   "bob_cluster_link_6_UP";
 >   "bobbob_cluster_router.hamburger.edu";

->   "bob_cluster_link_0_DOWN" -- "bob_cluster_backbone";
+>   "bob_cluster_link_0_DOWN" -- "bob0.hamburger.edu";
+>   "bob_cluster_link_2_DOWN" -- "bob2.hamburger.edu";
+>   "bob_cluster_link_3_DOWN" -- "bob3.hamburger.edu";
+>   "bob_cluster_link_4_DOWN" -- "bob4.hamburger.edu";
+>   "bob_cluster_link_6_DOWN" -- "bob6.hamburger.edu";

 >   "bob_cluster_link_0_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_0_UP" -- "bob_cluster_backbone";

->   "bob_cluster_link_2_DOWN" -- "bob_cluster_backbone";

 >   "bob_cluster_link_2_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_2_UP" -- "bob_cluster_backbone";

->   "bob_cluster_link_3_DOWN" -- "bob_cluster_backbone";

 >   "bob_cluster_link_3_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_3_UP" -- "bob_cluster_backbone";

->   "bob_cluster_link_4_DOWN" -- "bob_cluster_backbone";

 >   "bob_cluster_link_4_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_4_UP" -- "bob_cluster_backbone";

->   "bob_cluster_link_6_DOWN" -- "bob_cluster_backbone";

 >   "bob_cluster_link_6_UP" -- "bob_cluster_backbone";
 >   "bob_cluster_link_6_UP" -- "bob_cluster_backbone";

->   "bob0.hamburger.edu" -- "bob_cluster_link_0_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_0_DOWN";

 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_UP";
 >   "bob0.hamburger.edu" -- "bob_cluster_link_0_UP";

->   "bob2.hamburger.edu" -- "bob_cluster_link_2_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_2_DOWN";

 >   "bob2.hamburger.edu" -- "bob_cluster_link_2_UP";
 >   "bob2.hamburger.edu" -- "bob_cluster_link_2_UP";

->   "bob3.hamburger.edu" -- "bob_cluster_link_3_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_3_DOWN";

 >   "bob3.hamburger.edu" -- "bob_cluster_link_3_UP";
 >   "bob3.hamburger.edu" -- "bob_cluster_link_3_UP";

->   "bob4.hamburger.edu" -- "bob_cluster_link_4_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_4_DOWN";

 >   "bob4.hamburger.edu" -- "bob_cluster_link_4_UP";
 >   "bob4.hamburger.edu" -- "bob_cluster_link_4_UP";

->   "bob6.hamburger.edu" -- "bob_cluster_link_6_DOWN";
+>   "bob_cluster_backbone" -- "bob_cluster_link_6_DOWN";

 >   "bob6.hamburger.edu" -- "bob_cluster_link_6_UP";
 >   "bob_cluster_backbone" -- "bob_cluster";
 >   "bobbob_cluster_router.hamburger.edu" -- "bob_cluster";
 >   "bob6.hamburger.edu" -- "bob_cluster_link_6_UP";
 >   "bob_cluster_backbone" -- "bob_cluster";
 >   "bobbob_cluster_router.hamburger.edu" -- "bob_cluster";


@@ -58,25 +58,25 @@ $ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/platforms/one_cluster.xml test
 
 $ cat test.csv
 > src,dst
 
 $ cat test.csv
 > src,dst

-> bob_cluster_link_0_DOWN,bob_cluster_backbone
+> bob_cluster_link_0_DOWN,bob0.hamburger.edu
+> bob_cluster_link_2_DOWN,bob2.hamburger.edu
+> bob_cluster_link_3_DOWN,bob3.hamburger.edu
+> bob_cluster_link_4_DOWN,bob4.hamburger.edu
+> bob_cluster_link_6_DOWN,bob6.hamburger.edu

 > bob_cluster_link_0_UP,bob_cluster_backbone
 > bob_cluster_link_0_UP,bob_cluster_backbone

-> bob_cluster_link_2_DOWN,bob_cluster_backbone

 > bob_cluster_link_2_UP,bob_cluster_backbone
 > bob_cluster_link_2_UP,bob_cluster_backbone

-> bob_cluster_link_3_DOWN,bob_cluster_backbone

 > bob_cluster_link_3_UP,bob_cluster_backbone
 > bob_cluster_link_3_UP,bob_cluster_backbone

-> bob_cluster_link_4_DOWN,bob_cluster_backbone

 > bob_cluster_link_4_UP,bob_cluster_backbone
 > bob_cluster_link_4_UP,bob_cluster_backbone

-> bob_cluster_link_6_DOWN,bob_cluster_backbone

 > bob_cluster_link_6_UP,bob_cluster_backbone
 > bob_cluster_link_6_UP,bob_cluster_backbone

-> bob0.hamburger.edu,bob_cluster_link_0_DOWN
+> bob_cluster_backbone,bob_cluster_link_0_DOWN

 > bob0.hamburger.edu,bob_cluster_link_0_UP
 > bob0.hamburger.edu,bob_cluster_link_0_UP

-> bob2.hamburger.edu,bob_cluster_link_2_DOWN
+> bob_cluster_backbone,bob_cluster_link_2_DOWN

 > bob2.hamburger.edu,bob_cluster_link_2_UP
 > bob2.hamburger.edu,bob_cluster_link_2_UP

-> bob3.hamburger.edu,bob_cluster_link_3_DOWN
+> bob_cluster_backbone,bob_cluster_link_3_DOWN

 > bob3.hamburger.edu,bob_cluster_link_3_UP
 > bob3.hamburger.edu,bob_cluster_link_3_UP

-> bob4.hamburger.edu,bob_cluster_link_4_DOWN
+> bob_cluster_backbone,bob_cluster_link_4_DOWN

 > bob4.hamburger.edu,bob_cluster_link_4_UP
 > bob4.hamburger.edu,bob_cluster_link_4_UP

-> bob6.hamburger.edu,bob_cluster_link_6_DOWN
+> bob_cluster_backbone,bob_cluster_link_6_DOWN

 > bob6.hamburger.edu,bob_cluster_link_6_UP
 > bob_cluster_backbone,bob_cluster
 > bobbob_cluster_router.hamburger.edu,bob_cluster
 > bob6.hamburger.edu,bob_cluster_link_6_UP
 > bob_cluster_backbone,bob_cluster
 > bobbob_cluster_router.hamburger.edu,bob_cluster