From 897ca7c4c11e6c841d465d068b85a67108a8dbdf Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Sat, 27 Jun 2015 22:45:08 +0000 Subject: [PATCH] Code re-arrange. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10109 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/StateModelChecker.java | 36 +++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/prism/src/explicit/StateModelChecker.java b/prism/src/explicit/StateModelChecker.java index 948e6bd5..8db45bdd 100644 --- a/prism/src/explicit/StateModelChecker.java +++ b/prism/src/explicit/StateModelChecker.java @@ -1085,24 +1085,6 @@ public class StateModelChecker extends PrismComponent return resVals; } - /** - * Export a set of labels and the states that satisfy them. - * @param model The model - * @param labels The states that satisfy each label, specified as a BitSet - * @param labelNames The name of each label - * @param exportType The format in which to export - * @param out Where to export - */ - public void exportLabels(Model model, List labelNames, int exportType, PrismLog out) throws PrismException - { - List labels = new ArrayList(); - for (String labelName : labelNames) { - StateValues sv = checkExpression(model, new ExpressionLabel(labelName), null); - labels.add(sv.getBitSet()); - } - exportLabels(model, labels, labelNames, exportType, out); - } - /** * Extract maximal propositional subformulas of an expression, model check them and * replace them with ExpressionLabel objects (L0, L1, etc.) Expression passed in is modified directly, but the result @@ -1319,6 +1301,24 @@ public class StateModelChecker extends PrismComponent } } + /** + * Export a set of labels and the states that satisfy them. + * @param model The model + * @param labels The states that satisfy each label, specified as a BitSet + * @param labelNames The name of each label + * @param exportType The format in which to export + * @param out Where to export + */ + public void exportLabels(Model model, List labelNames, int exportType, PrismLog out) throws PrismException + { + List labels = new ArrayList(); + for (String labelName : labelNames) { + StateValues sv = checkExpression(model, new ExpressionLabel(labelName), null); + labels.add(sv.getBitSet()); + } + exportLabels(model, labels, labelNames, exportType, out); + } + /** * Export a set of labels and the states that satisfy them. * @param model The model