Changeset 1400:6b79d93e812f in lemon

Timestamp:

10/17/18 17:52:11 (6 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Planar drawing algorithm now works for less than 3 nodes (#611)

Files:

• lemon/planarity.h (modified) (1 diff)
• test/planarity_test.cc (modified) (2 diffs)

lemon/planarity.h

@@ -2398 +2398 @@
     void run(const EmbeddingMap& embedding) {
       typedef SmartEdgeSet<Graph> AuxGraph;
+
+      if (countNodes(_graph) < 3) {
+        int y = 0;
+        for (typename Graph::NodeIt n(_graph); n != INVALID; ++n) {
+          _point_map[n].x = 0;
+          _point_map[n].y = y++;
+        }
+        return;
+      }
 
       if (3 * countNodes(_graph) - 6 == countEdges(_graph)) {

test/planarity_test.cc

@@ -31 +31 @@
 using namespace lemon::dim2;
 
-const int lgfn = 4;
+const int lgfn = 8;
 const std::string lgf[lgfn] = {
+  "@nodes\n"
+  "label\n"
+  "@edges\n"
+  "     label\n",
+
+  "@nodes\n"
+  "label\n"
+  "0\n"
+  "@edges\n"
+  "     label\n",
+
+  "@nodes\n"
+  "label\n"
+  "0\n"
+  "1\n"
+  "@edges\n"
+  "     label\n"
+  "0 1  0\n",
+
+  "@nodes\n"
+  "label\n"
+  "0\n"
+  "1\n"
+  "2\n"
+  "@edges\n"
+  "     label\n"
+  "0 1  0\n"
+  "1 2  1\n"
+  "2 0  2\n",
+
   "@nodes\n"
   "label\n"
@@ -137 +167 @@
     }
   }
-  check(face_num + countNodes(graph) - countConnectedComponents(graph) ==
-        countEdges(graph) + 1, "Euler test does not passed");
+
+  if (face_num != 0) {
+    check(face_num + countNodes(graph) - countConnectedComponents(graph) ==
+          countEdges(graph) + 1, "Euler test does not passed");
+  }
 }