From f87f70ae80c09a3508d95980aa0e90bcd7655835 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 17 Apr 2020 00:34:29 +0100 Subject: [PATCH] Report accuracy for -exact mode too. --- prism/src/prism/Prism.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index b00b7b77..67110de5 100644 --- a/prism/src/prism/Prism.java +++ b/prism/src/prism/Prism.java @@ -63,6 +63,7 @@ import parser.ast.LabelList; import parser.ast.ModulesFile; import parser.ast.PropertiesFile; import parser.ast.Property; +import prism.Accuracy.AccuracyLevel; import pta.DigitalClocks; import pta.PTAModelChecker; import simulator.GenerateSimulationPath; @@ -3400,17 +3401,15 @@ public class Prism extends PrismComponent implements PrismSettingsListener // There should be just one region since no parameters are used ParamResult paramResult = (ParamResult) result.getResult(); result.setResult(paramResult.getSimpleResult(prop.getType())); + result.setAccuracy(new Accuracy(AccuracyLevel.EXACT)); // Print result to log String resultString = "Result"; - if (!("Result".equals(prop.getExpression().getResultName()))) - resultString += " (" + prop.getExpression().getResultName().toLowerCase() + ")"; - resultString += ": " + result.getResultString(); - mainLog.println("\n" + resultString); - + resultString += ": " + result.getResultAndAccuracy(); if (result.getResult() instanceof BigRational) { - mainLog.println(" As floating point: " + ((BigRational)result.getResult()).toApproximateString()); + resultString += " (" + ((BigRational) result.getResult()).toApproximateString() + ")"; } + mainLog.println("\n" + resultString); return result; }