From 5ed87d429bfb55ac546dceb9c0fc4db8146a1339 Mon Sep 17 00:00:00 2001
From: Manos Koukoutos <emmanouil.koukoutos@epfl.ch>
Date: Tue, 15 Mar 2016 11:45:11 +0100
Subject: [PATCH] Printing fixes in Graph
---
src/main/scala/leon/synthesis/graph/Graph.scala | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/scala/leon/synthesis/graph/Graph.scala b/src/main/scala/leon/synthesis/graph/Graph.scala
index c3bdc2b67..af52ea5b9 100644
--- a/src/main/scala/leon/synthesis/graph/Graph.scala
+++ b/src/main/scala/leon/synthesis/graph/Graph.scala
@@ -78,13 +78,13 @@ class AndNode(parent: Option[Node], val ri: RuleInstantiation) extends Node(pare
def pad(prefix: String, message: String): String = {
val lines = message.split("\\n").toList
- val padding = " " * prefix.size
- prefix + lines.head + "\n" + lines.tail.map(padding + _).mkString("\n")
+ val padding = " " * (prefix.length + 1)
+ prefix + " " + lines.head + "\n" + lines.tail.map(padding + _).mkString("\n")
}
import hctx.reporter.info
- val prefix = f"[${Option(ri.rule).getOrElse("?")}%-20s] "
+ val prefix = f"[${Option(ri.rule.asString).getOrElse("?")}%-20s]"
info(pad(prefix, ri.problem.asString))
@@ -96,11 +96,11 @@ class AndNode(parent: Option[Node], val ri: RuleInstantiation) extends Node(pare
isSolved = sols.nonEmpty
if (sols.isEmpty) {
- info(prefix+"Failed")
+ info(s"$prefix Failed")
isDeadEnd = true
} else {
val sol = sols.head
- val morePrefix = s"$prefix Solved ${(if(sol.isTrusted) "" else " (untrusted)")} with: "
+ val morePrefix = s"$prefix Solved ${if(sol.isTrusted) "" else "(untrusted)"} with: "
info(pad(morePrefix, sol.asString))
}
@@ -111,8 +111,8 @@ class AndNode(parent: Option[Node], val ri: RuleInstantiation) extends Node(pare
}
case RuleExpanded(probs) =>
- info(prefix+"Decomposed into:")
- val morePrefix = prefix + " - "
+ info(s"$prefix Decomposed into:")
+ val morePrefix = s"$prefix -"
for(p <- probs) {
info(pad(morePrefix, p.asString))
}
--
GitLab