refactor: change sequence/graph vertex name to edge (#31)

Co-authored-by: ArthurSonzogni <[email protected]>
ArthurSonzogni · Feb 13, 2022 · fffa39b · fffa39b
1 parent 0d4a89e
commit fffa39b
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/src/boost b/src/boost
diff --git a/src/translator/graph_planar/CMakeLists.txt b/src/translator/graph_planar/CMakeLists.txt
@@ -1,5 +1,7 @@
 ANTLR(GraphPlanar.g4)
 
+find_package(Boost COMPONENTS graph)
+
 add_library(translator_graph_planar STATIC
   GraphPlanarLexer.cpp
   GraphPlanarParser.cpp
@@ -10,6 +12,8 @@ else()
   target_compile_options(translator_graph_planar PRIVATE "-Wno-attributes")
 endif()
 
-target_link_libraries(translator_graph_planar PRIVATE diagon_base)
-target_link_libraries(translator_graph_planar PRIVATE antlr4_static)
+target_link_libraries(translator_graph_planar
+  PRIVATE diagon_base
+  PRIVATE antlr4_static
+  PRIVATE Boost::graph)
 target_set_common(translator_graph_planar)
diff --git a/src/translator/sequence/Graph.cpp b/src/translator/sequence/Graph.cpp
@@ -10,8 +10,8 @@
 
 namespace graph {
 
-Vertex::Vertex(const Node& from, const Node& to) : from(from), to(to) {}
-Vertex::Vertex(const Message& message)
+Edge::Edge(const Node& from, const Node& to) : from(from), to(to) {}
+Edge::Edge(const Message& message)
     : from({message.from, message.id}), to({message.to, message.id}) {}
 
 bool operator<(const Node& a, const Node& b) {
@@ -22,25 +22,25 @@ bool operator<(const Node& a, const Node& b) {
   return a.message < b.message;
 }
 
-bool operator<(const Vertex& a, const Vertex& b) {
+bool operator<(const Edge& a, const Edge& b) {
   if (a.from < b.from)
     return true;
   if (b.from < a.from)
     return false;
   return a.to < b.to;
 }
 
-using Graph = std::set<Vertex>;
+using Graph = std::set<Edge>;
 
 std::vector<Node> FindTopologicalOrder(const Graph& graph) {
   std::map<Node, int> weight;
   bool work_to_do = true;
   int iteration = 0;
   while (work_to_do) {
     work_to_do = false;
-    for (const auto& vertex : graph) {
-      if (weight[vertex.to] <= weight[vertex.from]) {
-        weight[vertex.to] = weight[vertex.from] + 1;
+    for (const auto& edge : graph) {
+      if (weight[edge.to] <= weight[edge.from]) {
+        weight[edge.to] = weight[edge.from] + 1;
         work_to_do = true;
       }
     }

diff --git a/src/translator/sequence/Graph.hpp b/src/translator/sequence/Graph.hpp
@@ -19,18 +19,18 @@ struct Node {
   int message;
 };
 
-struct Vertex {
+struct Edge {
   Node from;
   Node to;
 
-  Vertex(const Node& from, const Node& to);
-  Vertex(const Message& message);
+  Edge(const Node& from, const Node& to);
+  Edge(const Message& message);
 };
 
-using Graph = std::set<Vertex>;
+using Graph = std::set<Edge>;
 
 bool operator<(const Node& a, const Node& b);
-bool operator<(const Vertex& a, const Vertex& b);
+bool operator<(const Edge& a, const Edge& b);
 std::vector<Node> FindTopologicalOrder(const Graph& graph);
 
 }  // namespace graph
diff --git a/src/translator/sequence/Sequence.cpp b/src/translator/sequence/Sequence.cpp
@@ -591,7 +591,7 @@ void Sequence::LayoutComputeMessagesPositions() {
       if (cut.count(message.id)) {
         graph::Node from = {actor_index[message.from], message.id};
         graph::Node to = {actor_index[message.to], message.id};
-        graph.insert(graph::Vertex(from, to));
+        graph.insert(graph::Edge(from, to));
       }
     }
     std::set<int> started_message;