Changeset 1181:1e5da3fc4fbc in lemon-main

Timestamp:

05/15/18 14:16:35 (7 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Fix PlanarDrawing::run() function (#610)

Files:

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

lemon/planarity.h

@@ -2384 +2384 @@
       if (!pe.run()) return false;
 
-      run(pe);
+      run(pe.embeddingMap());
       return true;
     }

test/planarity_test.cc

@@ -246 +246 @@
       checkEmbedding(graph, pe);
 
-      PlanarDrawing<Graph> pd(graph);
-      pd.run(pe.embeddingMap());
-      checkDrawing(graph, pd);
-
-      PlanarColoring<Graph> pc(graph);
-      pc.runFiveColoring(pe.embeddingMap());
-      checkColoring(graph, pc, 5);
+      {
+        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);
+      }
 
     } else {