From 70b1ac94f9d30fc4cba30799ed346dd622f97ebd Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Tue, 11 Jun 2013 15:22:47 +0000 Subject: [PATCH] Bug fix and implemente dmissing methods in DTMCFromMDPMemorylessAdversary. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6905 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- .../explicit/DTMCFromMDPMemorylessAdversary.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java b/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java index a8996db5..5a868e77 100644 --- a/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java +++ b/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java @@ -44,8 +44,6 @@ public class DTMCFromMDPMemorylessAdversary extends DTMCExplicit { // Parent MDP protected MDP mdp; - // Also store num states for easy access - protected int numStates; // Adversary protected int adv[]; @@ -114,7 +112,10 @@ public class DTMCFromMDPMemorylessAdversary extends DTMCExplicit public int getNumTransitions() { - throw new RuntimeException("Not implemented"); + int numTransitions = 0; + for (int s = 0; s < numStates; s++) + numTransitions += mdp.getNumTransitions(s, adv[s]); + return numTransitions; } public Iterator getSuccessorsIterator(final int s) @@ -170,19 +171,16 @@ public class DTMCFromMDPMemorylessAdversary extends DTMCExplicit return mdp.infoString() + " + " + "???\n"; // TODO } - // Accessors (for DTMC) public double getNumTransitions(int s) { - // TODO - throw new RuntimeException("Not implemented yet"); + return mdp.getNumTransitions(s, adv[s]); } public Iterator> getTransitionsIterator(int s) { - // TODO - throw new RuntimeException("Not implemented yet"); + return mdp.getTransitionsIterator(s, adv[s]); } public void prob0step(BitSet subset, BitSet u, BitSet result)