From b970c2740b992b3a2986721976590a37d64bda39 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 21 May 2014 11:03:36 +0000 Subject: [PATCH] Fix oddity in return type of DTMC.getNumTransitions(s) - double not int. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8254 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/explicit/DTMC.java | 2 +- prism/src/explicit/DTMCEmbeddedSimple.java | 2 +- prism/src/explicit/DTMCFromMDPAndMDStrategy.java | 2 +- prism/src/explicit/DTMCFromMDPMemorylessAdversary.java | 2 +- prism/src/explicit/DTMCSimple.java | 2 +- prism/src/explicit/DTMCUniformisedSimple.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/prism/src/explicit/DTMC.java b/prism/src/explicit/DTMC.java index 46c53e0e..28721c6d 100644 --- a/prism/src/explicit/DTMC.java +++ b/prism/src/explicit/DTMC.java @@ -39,7 +39,7 @@ public interface DTMC extends Model /** * Get the number of transitions from state s. */ - public double getNumTransitions(int s); + public int getNumTransitions(int s); /** * Get an iterator over the transitions from state s. diff --git a/prism/src/explicit/DTMCEmbeddedSimple.java b/prism/src/explicit/DTMCEmbeddedSimple.java index 86b5985a..0a9ea3be 100644 --- a/prism/src/explicit/DTMCEmbeddedSimple.java +++ b/prism/src/explicit/DTMCEmbeddedSimple.java @@ -193,7 +193,7 @@ public class DTMCEmbeddedSimple extends DTMCExplicit // Accessors (for DTMC) - public double getNumTransitions(int s) + public int getNumTransitions(int s) { // TODO throw new RuntimeException("Not implemented yet"); diff --git a/prism/src/explicit/DTMCFromMDPAndMDStrategy.java b/prism/src/explicit/DTMCFromMDPAndMDStrategy.java index 249cb55c..f7225b94 100644 --- a/prism/src/explicit/DTMCFromMDPAndMDStrategy.java +++ b/prism/src/explicit/DTMCFromMDPAndMDStrategy.java @@ -175,7 +175,7 @@ public class DTMCFromMDPAndMDStrategy extends DTMCExplicit // Accessors (for DTMC) - public double getNumTransitions(int s) + public int getNumTransitions(int s) { return strat.isChoiceDefined(s) ? mdp.getNumTransitions(s, strat.getChoiceIndex(s)) : 0; } diff --git a/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java b/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java index 826f81bf..b7c76731 100644 --- a/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java +++ b/prism/src/explicit/DTMCFromMDPMemorylessAdversary.java @@ -174,7 +174,7 @@ public class DTMCFromMDPMemorylessAdversary extends DTMCExplicit // Accessors (for DTMC) - public double getNumTransitions(int s) + public int getNumTransitions(int s) { return adv[s] >= 0 ? mdp.getNumTransitions(s, adv[s]) : 0; } diff --git a/prism/src/explicit/DTMCSimple.java b/prism/src/explicit/DTMCSimple.java index 3c038d80..4fe17445 100644 --- a/prism/src/explicit/DTMCSimple.java +++ b/prism/src/explicit/DTMCSimple.java @@ -262,7 +262,7 @@ public class DTMCSimple extends DTMCExplicit implements ModelSimple // Accessors (for DTMC) @Override - public double getNumTransitions(int s) + public int getNumTransitions(int s) { return trans.get(s).size(); } diff --git a/prism/src/explicit/DTMCUniformisedSimple.java b/prism/src/explicit/DTMCUniformisedSimple.java index 9f1398d1..ccf430b3 100644 --- a/prism/src/explicit/DTMCUniformisedSimple.java +++ b/prism/src/explicit/DTMCUniformisedSimple.java @@ -198,7 +198,7 @@ public class DTMCUniformisedSimple extends DTMCExplicit // Accessors (for DTMC) - public double getNumTransitions(int s) + public int getNumTransitions(int s) { // TODO throw new RuntimeException("Not implemented yet");