From 34a977db523c06141001725c2d4a69488c8e943d Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 9 Jul 2013 12:43:02 +0000 Subject: [PATCH] Partial changes to strategy classes. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6999 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/Prism.java | 1 + prism/src/strat/MDStrategy.java | 1 + prism/src/strat/MDStrategyArray.java | 10 +++++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java index 6932c0e1..c0ffdecc 100644 --- a/prism/src/prism/Prism.java +++ b/prism/src/prism/Prism.java @@ -2674,6 +2674,7 @@ public class Prism implements PrismSettingsListener /** * Export a strategy (for the currently loaded model); + * TODO: is it necessarily loaded? * @param strat The strategy * @param file File to output the path to (stdout if null) */ diff --git a/prism/src/strat/MDStrategy.java b/prism/src/strat/MDStrategy.java index f762d64c..9f5cf38a 100644 --- a/prism/src/strat/MDStrategy.java +++ b/prism/src/strat/MDStrategy.java @@ -36,6 +36,7 @@ public abstract class MDStrategy implements Strategy { public abstract int getNumStates(); public abstract int getChoice(int i); + public abstract Object getChoiceAction(int i); public void export(PrismLog out) { diff --git a/prism/src/strat/MDStrategyArray.java b/prism/src/strat/MDStrategyArray.java index 82ef0262..76ff5e6d 100644 --- a/prism/src/strat/MDStrategyArray.java +++ b/prism/src/strat/MDStrategyArray.java @@ -32,14 +32,16 @@ package strat; */ public class MDStrategyArray extends MDStrategy { + private explicit.Model model; private int choices[]; /** * Creates an MDStrategyArray from an integer array of choices. * The array may later be modified/delete - take a copy if you want to keep it. */ - public MDStrategyArray(int choices[]) + public MDStrategyArray(explicit.Model model, int choices[]) { + this.model = model; this.choices = choices; } @@ -54,4 +56,10 @@ public class MDStrategyArray extends MDStrategy { return choices[i]; } + + @Override + public Object getChoiceAction(int i) + { + return "";//model.getAction(choices[i]); + } }