Browse Source

Add default implementation of infoString() and infoStringTable() to ModelExplicit.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@10011 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 11 years ago
parent
commit
e9afcf0419
  1. 18
      prism/src/explicit/DTMCExplicit.java
  2. 4
      prism/src/explicit/DTMCUniformisedSimple.java
  3. 18
      prism/src/explicit/ModelExplicit.java

18
prism/src/explicit/DTMCExplicit.java

@ -54,24 +54,6 @@ public abstract class DTMCExplicit extends ModelExplicit implements DTMC
return ModelType.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 @Override
public void exportToPrismExplicitTra(PrismLog out) public void exportToPrismExplicitTra(PrismLog out)
{ {

4
prism/src/explicit/DTMCUniformisedSimple.java

@ -183,7 +183,7 @@ public class DTMCUniformisedSimple extends DTMCExplicit
public String infoString() public String infoString()
{ {
String s = ""; String s = "";
s += numStates + " states (" + getNumInitialStates() + " initial)";
s += getNumStates() + " states (" + getNumInitialStates() + " initial)";
s += ", " + getNumTransitions() + " transitions (incl. " + numExtraTransitions + " self-loops)"; s += ", " + getNumTransitions() + " transitions (incl. " + numExtraTransitions + " self-loops)";
return s; return s;
} }
@ -192,7 +192,7 @@ public class DTMCUniformisedSimple extends DTMCExplicit
public String infoStringTable() public String infoStringTable()
{ {
String s = ""; String s = "";
s += "States: " + numStates + " (" + getNumInitialStates() + " initial)\n";
s += "States: " + getNumStates() + " (" + getNumInitialStates() + " initial)\n";
s += "Transitions: " + getNumTransitions() + "\n"; s += "Transitions: " + getNumTransitions() + "\n";
return s; return s;
} }

18
prism/src/explicit/ModelExplicit.java

@ -402,11 +402,23 @@ public abstract class ModelExplicit implements Model
} }
@Override @Override
public abstract String infoString();
public String infoString()
{
String s = "";
s += numStates + " states (" + getNumInitialStates() + " initial)";
s += ", " + getNumTransitions() + " transitions";
return s;
}
@Override @Override
public abstract String infoStringTable();
public String infoStringTable()
{
String s = "";
s += "States: " + numStates + " (" + getNumInitialStates() + " initial)\n";
s += "Transitions: " + getNumTransitions() + "\n";
return s;
}
@Override @Override
public boolean equals(Object o) public boolean equals(Object o)
{ {

Loading…
Cancel
Save