From c476f05eac5ab5269c625b06cf23bd6b467f9074 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 6 Sep 2011 12:00:50 +0000 Subject: [PATCH] Partial implementation of explicit print filter. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3591 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/StateModelChecker.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/prism/src/explicit/StateModelChecker.java b/prism/src/explicit/StateModelChecker.java index b0ad3e59..35c6940b 100644 --- a/prism/src/explicit/StateModelChecker.java +++ b/prism/src/explicit/StateModelChecker.java @@ -573,17 +573,16 @@ public class StateModelChecker // Compute result according to filter type op = expr.getOperatorType(); switch (op) { - /*case PRINT: + case PRINT: // Format of print-out depends on type if (expr.getType() instanceof TypeBool) { // NB: 'usual' case for filter(print,...) on Booleans is to use no filter - mainLog.print("\nSatisfying states"); + /*mainLog.print("\nSatisfying states"); mainLog.println(filterTrue ? ":" : " that are also in filter " + filter + ":"); dd = vals.deepCopy().convertToStateValuesMTBDD().getJDDNode(); new StateListMTBDD(dd, model).print(mainLog); - JDD.Deref(dd); + JDD.Deref(dd);*/ } else { - // TODO: integer-typed case: either add to print method or store in StateValues mainLog.println("\nResults (non-zero only) for filter " + filter + ":"); vals.printFiltered(mainLog, bsFilter); } @@ -592,7 +591,7 @@ public class StateModelChecker resVals = vals; // Set vals to null to stop it being cleared below vals = null; - break;*/ + break; case MIN: // Compute min // Store as object/vector