diff --git a/prism/src/explicit/DTMCExplicit.java b/prism/src/explicit/DTMCExplicit.java index 7efb5ec2..65b1949a 100644 --- a/prism/src/explicit/DTMCExplicit.java +++ b/prism/src/explicit/DTMCExplicit.java @@ -54,24 +54,6 @@ public abstract class DTMCExplicit extends ModelExplicit implements DTMC return ModelType.DTMC; } - @Override - public String infoString() - { - String s = ""; - s += numStates + " states (" + getNumInitialStates() + " initial)"; - s += ", " + getNumTransitions() + " transitions"; - return s; - } - - @Override - public String infoStringTable() - { - String s = ""; - s += "States: " + numStates + " (" + getNumInitialStates() + " initial)\n"; - s += "Transitions: " + getNumTransitions() + "\n"; - return s; - } - @Override public void exportToPrismExplicitTra(PrismLog out) { diff --git a/prism/src/explicit/DTMCUniformisedSimple.java b/prism/src/explicit/DTMCUniformisedSimple.java index 14c55824..86bc8d3f 100644 --- a/prism/src/explicit/DTMCUniformisedSimple.java +++ b/prism/src/explicit/DTMCUniformisedSimple.java @@ -183,7 +183,7 @@ public class DTMCUniformisedSimple extends DTMCExplicit public String infoString() { String s = ""; - s += numStates + " states (" + getNumInitialStates() + " initial)"; + s += getNumStates() + " states (" + getNumInitialStates() + " initial)"; s += ", " + getNumTransitions() + " transitions (incl. " + numExtraTransitions + " self-loops)"; return s; } @@ -192,7 +192,7 @@ public class DTMCUniformisedSimple extends DTMCExplicit public String infoStringTable() { String s = ""; - s += "States: " + numStates + " (" + getNumInitialStates() + " initial)\n"; + s += "States: " + getNumStates() + " (" + getNumInitialStates() + " initial)\n"; s += "Transitions: " + getNumTransitions() + "\n"; return s; } diff --git a/prism/src/explicit/ModelExplicit.java b/prism/src/explicit/ModelExplicit.java index fe923ebd..94844fe8 100644 --- a/prism/src/explicit/ModelExplicit.java +++ b/prism/src/explicit/ModelExplicit.java @@ -402,11 +402,23 @@ public abstract class ModelExplicit implements Model } @Override - public abstract String infoString(); + public String infoString() + { + String s = ""; + s += numStates + " states (" + getNumInitialStates() + " initial)"; + s += ", " + getNumTransitions() + " transitions"; + return s; + } @Override - public abstract String infoStringTable(); - + public String infoStringTable() + { + String s = ""; + s += "States: " + numStates + " (" + getNumInitialStates() + " initial)\n"; + s += "Transitions: " + getNumTransitions() + "\n"; + return s; + } + @Override public boolean equals(Object o) {