Changes in test/planarity_test.cc [1182:6b79d93e812f:798:58c330ad0b5c] in lemon-main

File:

• test/planarity_test.cc (modified) (3 diffs)

test/planarity_test.cc

@@ -31 +31 @@
 using namespace lemon::dim2;
 
-const int lgfn = 8;
+const int lgfn = 4;
 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"
@@ -167 +137 @@
     }
   }
-
-  if (face_num != 0) {
-    check(face_num + countNodes(graph) - countConnectedComponents(graph) ==
-          countEdges(graph) + 1, "Euler test does not passed");
-  }
+  check(face_num + countNodes(graph) - countConnectedComponents(graph) ==
+        countEdges(graph) + 1, "Euler test does not passed");
 }
 
@@ -279 +246 @@
       checkEmbedding(graph, pe);
 
-      {
-        PlanarDrawing<Graph> pd(graph);
-        pd.run(pe.embeddingMap());
-        checkDrawing(graph, pd);
-      }
-
-      {
-        PlanarDrawing<Graph> pd(graph);
-        pd.run();
-        checkDrawing(graph, pd);
-      }
-
-      {
-        PlanarColoring<Graph> pc(graph);
-        pc.runFiveColoring(pe.embeddingMap());
-        checkColoring(graph, pc, 5);
-      }
-
-      {
-        PlanarColoring<Graph> pc(graph);
-        pc.runFiveColoring();
-        checkColoring(graph, pc, 5);
-      }
+      PlanarDrawing<Graph> pd(graph);
+      pd.run(pe.embeddingMap());
+      checkDrawing(graph, pd);
+
+      PlanarColoring<Graph> pc(graph);
+      pc.runFiveColoring(pe.embeddingMap());
+      checkColoring(graph, pc, 5);
 
     } else {