diff --git a/prism/src/prism/StochModelChecker.java b/prism/src/prism/StochModelChecker.java index 1d1c40ad..bb09f21e 100644 --- a/prism/src/prism/StochModelChecker.java +++ b/prism/src/prism/StochModelChecker.java @@ -1061,8 +1061,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute probabilities of reaching each bscc... for (i = 0; i < n; i++) { @@ -1188,8 +1188,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute probabilities probs = computeNextProbs(emb, b); @@ -1278,8 +1278,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(trans); JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute probs try { probs = computeUntilProbs(emb, trans01, b1, b2); @@ -1302,8 +1302,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(trans); JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute unbounded until probs try { tmpProbs = computeUntilProbs(emb, trans01, b1, b2); @@ -1419,8 +1419,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute probabilities try { @@ -1556,8 +1556,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // convert rewards JDD.Ref(stateRewards); @@ -1708,8 +1708,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute probabilities of reaching each bscc... for (i = 0; i < n; i++) { @@ -1907,8 +1907,8 @@ public class StochModelChecker implements ModelChecker JDD.Ref(diags); emb = JDD.Apply(JDD.DIVIDE, trans, diags); - mainLog.print("\nDiagonals vector: ");JDD.PrintInfo(diags, allDDRowVars.n()); - mainLog.print("Embedded Markov chain: ");JDD.PrintInfo(emb, allDDRowVars.n()*2); + mainLog.println("\nDiagonals vector: " + JDD.GetInfoString(diags, allDDRowVars.n())); + mainLog.println("Embedded Markov chain: " + JDD.GetInfoString(emb, allDDRowVars.n()*2)); // compute prob of reaching each bscc from initial state probBSCCs = new double[n];