equal
deleted
inserted
replaced
267 { |
267 { |
268 ((graph, false) /: (0 until level.length)) { |
268 ((graph, false) /: (0 until level.length)) { |
269 case ((graph, moved), i) => |
269 case ((graph, moved), i) => |
270 val r = level(i) |
270 val r = level(i) |
271 val d = r.deflection(graph, top_down) |
271 val d = r.deflection(graph, top_down) |
272 val offset = |
272 val dx = |
273 if (d < 0 && i > 0) |
273 if (d < 0.0 && i > 0) |
274 - (level(i - 1).distance(metrics, graph, r) min (- d)) |
274 - (level(i - 1).distance(metrics, graph, r) min (- d)) |
275 else if (d >= 0 && i < level.length - 1) |
275 else if (d >= 0.0 && i < level.length - 1) |
276 r.distance(metrics, graph, level(i + 1)) min d |
276 r.distance(metrics, graph, level(i + 1)) min d |
277 else d |
277 else d |
278 (r.move(graph, offset), moved || d != 0) |
278 (r.move(graph, dx), moved || d != 0.0) |
279 } |
279 } |
280 } |
280 } |
281 |
281 |
282 val initial_regions = levels.map(level => level.map(l => new Region(List(l)))) |
282 val initial_regions = levels.map(level => level.map(l => new Region(List(l)))) |
283 |
283 |