# HG changeset patch
# User wenzelm
# Date 1420322206 -3600
# Node ID a73d2b67897c69198852d18c938f2f4a916734d0
# Parent  a80d2ef0b745bd007bb4cd1589b5ccdcd582eeee
tuned -- more iterators;

diff -r a80d2ef0b745 -r a73d2b67897c src/Tools/Graphview/layout.scala
--- a/src/Tools/Graphview/layout.scala	Sat Jan 03 22:34:18 2015 +0100
+++ b/src/Tools/Graphview/layout.scala	Sat Jan 03 22:56:46 2015 +0100
@@ -256,19 +256,19 @@
   {
     var nodes: List[Key] = List(node)
 
-    def left(coords: Coordinates): Double = nodes.map(coords(_)._1).min
-    def right(coords: Coordinates): Double = nodes.map(coords(_)._1).max
+    def left(coords: Coordinates): Double = nodes.iterator.map(coords(_)._1).min
+    def right(coords: Coordinates): Double = nodes.iterator.map(coords(_)._1).max
 
     def distance(coords: Coordinates, to: Region): Double =
       math.abs(left(coords) - to.left(coords)) min
       math.abs(right(coords) - to.right(coords))
 
-    def deflection(coords: Coordinates, use_preds: Boolean) =
-      nodes.map(k => (coords(k)._1,
-                      if (use_preds) graph.imm_preds(k).toList  // FIXME iterator
-                      else graph.imm_succs(k).toList))
-      .map({ case (x, as) => as.map(coords(_)._1 - x).sum / (as.length max 1) })
-      .sum / nodes.length
+    def deflection(coords: Coordinates, top_down: Boolean): Double =
+      (for {
+        k <- nodes.iterator
+        x = coords(k)._1
+        as = if (top_down) graph.imm_preds(k) else graph.imm_succs(k)
+      } yield as.iterator.map(coords(_)._1 - x).sum / (as.size max 1)).sum / nodes.length
 
     def move(coords: Coordinates, by: Double): Coordinates =
       (coords /: nodes) {