# HG changeset patch
# User wenzelm
# Date 1421857678 -3600
# Node ID 2fb2194853cccc4f0d5e7462469e957c08878ff4
# Parent  b48fdcd4e1937dc481e76faa7e9c9705055f87e0
clarified iterations: enforce full top_down/bottom_up cycle for better stability of layout;

diff -r b48fdcd4e193 -r 2fb2194853cc src/Tools/Graphview/etc/options
--- a/src/Tools/Graphview/etc/options	Wed Jan 21 16:07:37 2015 +0100
+++ b/src/Tools/Graphview/etc/options	Wed Jan 21 17:27:58 2015 +0100
@@ -11,13 +11,13 @@
 public option graphview_font_scale : real = 0.85
   -- "scale factor of graph view wrt. main text font"
 
-public option graphview_iterations_minimize_crossings : int = 40
+public option graphview_iterations_minimize_crossings : int = 20
   -- "number of iterations to minimize edge crossings"
 
-public option graphview_iterations_pendulum : int = 10
+public option graphview_iterations_pendulum : int = 5
   -- "number of iterations for pendulum method"
 
-public option graphview_iterations_rubberband : int = 10
+public option graphview_iterations_rubberband : int = 5
   -- "number of iterations for rubberband method"
 
 public option graphview_content_margin : int = 60
diff -r b48fdcd4e193 -r 2fb2194853cc src/Tools/Graphview/layout.scala
--- a/src/Tools/Graphview/layout.scala	Wed Jan 21 16:07:37 2015 +0100
+++ b/src/Tools/Graphview/layout.scala	Wed Jan 21 17:27:58 2015 +0100
@@ -195,9 +195,10 @@
           (v, weight)
       }).sortBy(_._2).map(_._1)
 
-    ((levels, count_crossings(graph, levels), true) /:
-      (1 to options.int("graphview_iterations_minimize_crossings"))) {
-      case ((old_levels, old_crossings, top_down), _) =>
+    ((levels, count_crossings(graph, levels)) /:
+      (1 to (2 * options.int("graphview_iterations_minimize_crossings")))) {
+      case ((old_levels, old_crossings), iteration) =>
+        val top_down = (iteration % 2 == 1)
         val new_levels =
           if (top_down)
             (List(old_levels.head) /: old_levels.tail)((tops, bot) =>
@@ -209,9 +210,9 @@
           }
         val new_crossings = count_crossings(graph, new_levels)
         if (new_crossings < old_crossings)
-          (new_levels, new_crossings, !top_down)
+          (new_levels, new_crossings)
         else
-          (old_levels, old_crossings, !top_down)
+          (old_levels, old_crossings)
     }._1
   }
 
@@ -303,9 +304,10 @@
 
     val initial_regions = levels.map(level => level.map(l => new Region(List(l))))
 
-    ((levels_graph, initial_regions, true, true) /:
-      (1 to options.int("graphview_iterations_pendulum"))) {
-      case ((graph, regions, top_down, moved), _) =>
+    ((levels_graph, initial_regions, true) /:
+      (1 to (2 * options.int("graphview_iterations_pendulum")))) {
+      case ((graph, regions, moved), iteration) =>
+        val top_down = (iteration % 2 == 1)
         if (moved) {
           val (graph1, regions1, moved1) =
             ((graph, List.empty[List[Region]], false) /:
@@ -314,9 +316,9 @@
                 val (graph1, moved1) = deflect(bot1, top_down, graph)
                 (graph1, bot1 :: tops, moved || moved1)
             }
-          (graph1, regions1.reverse, !top_down, moved1)
+          (graph1, regions1.reverse, moved1)
         }
-        else (graph, regions, !top_down, moved)
+        else (graph, regions, moved)
     }._1
   }
 
@@ -341,7 +343,7 @@
   {
     val gap = metrics.gap
 
-    (graph /: (1 to options.int("graphview_iterations_rubberband"))) { case (graph, _) =>
+    (graph /: (1 to (2 * options.int("graphview_iterations_rubberband")))) { case (graph, _) =>
       (graph /: levels) { case (graph, level) =>
         val m = level.length - 1
         (graph /: level.iterator.zipWithIndex) {