From 6b21b0543d76939ff5d38b9de15c8dd280745a43 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Thu, 11 Aug 2011 11:43:13 +0000 Subject: [PATCH] Added ModelType.probabilityOrRate() method, used in simulator. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@3447 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/ModelType.java | 15 +++++++++++++++ .../src/userinterface/simulator/GUISimulator.java | 6 +----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/prism/src/prism/ModelType.java b/prism/src/prism/ModelType.java index fd8c6f67..da82c55c 100644 --- a/prism/src/prism/ModelType.java +++ b/prism/src/prism/ModelType.java @@ -135,6 +135,21 @@ public enum ModelType { return true; } + /** + * Does this model have probabilities or rates? + * @return "Probability" or "Rate" + */ + public String probabilityOrRate() + { + switch (this) { + case CTMC: + case CTMDP: + return "Rate"; + default: + return "Probability"; + } + } + public static ModelType parseName(String name) { if ("ctmc".equals(name)) diff --git a/prism/src/userinterface/simulator/GUISimulator.java b/prism/src/userinterface/simulator/GUISimulator.java index 6fab46d1..21ad82ee 100644 --- a/prism/src/userinterface/simulator/GUISimulator.java +++ b/prism/src/userinterface/simulator/GUISimulator.java @@ -2077,11 +2077,7 @@ public class GUISimulator extends GUIPlugin implements MouseListener, ListSelect case 0: return "Module/[action]"; case 1: { - if (parsedModel != null && parsedModel.getModelType() == ModelType.CTMC) - return "Rate"; - else - return "Probability"; - + return parsedModel == null ? "Probability" : parsedModel.getModelType().probabilityOrRate(); } case 2: return "Update";