Browse Source

Slight tidy/re-arrange in Prism.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4521 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
e702f606a2
  1. 15
      prism/src/prism/Prism.java

15
prism/src/prism/Prism.java

@ -155,7 +155,7 @@ public class Prism implements PrismSettingsListener
private PrismLog techLog; // another one for technical/diagnostic output private PrismLog techLog; // another one for technical/diagnostic output
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// parsers/translators
// Parsers/translators/model checkers/simulators/etc.
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
private static PrismParser thePrismParser = null; private static PrismParser thePrismParser = null;
@ -163,22 +163,16 @@ public class Prism implements PrismSettingsListener
private Modules2MTBDD mod2mtbdd = null; private Modules2MTBDD mod2mtbdd = null;
private ExplicitFiles2MTBDD expf2mtbdd = null; private ExplicitFiles2MTBDD expf2mtbdd = null;
private ExplicitModel2MTBDD expm2mtbdd = null; private ExplicitModel2MTBDD expm2mtbdd = null;
//------------------------------------------------------------------------------
// model checkers/simulators
//------------------------------------------------------------------------------
private ModelChecker mc = null;
private SimulatorEngine theSimulator = null; private SimulatorEngine theSimulator = null;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// flags
// State
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
private boolean cuddStarted = false; private boolean cuddStarted = false;
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// methods
// Methods
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
/** /**
@ -1581,6 +1575,7 @@ public class Prism implements PrismSettingsListener
*/ */
public Result modelCheck(Model model, PropertiesFile propertiesFile, Expression expr) throws PrismException, PrismLangException public Result modelCheck(Model model, PropertiesFile propertiesFile, Expression expr) throws PrismException, PrismLangException
{ {
ModelChecker mc = null;
Result res; Result res;
// Check that property is valid for this model type // Check that property is valid for this model type
@ -1750,6 +1745,7 @@ public class Prism implements PrismSettingsListener
public void doSteadyState(Model model, int exportType, File fileOut) throws PrismException public void doSteadyState(Model model, int exportType, File fileOut) throws PrismException
{ {
long l = 0; // timer long l = 0; // timer
ModelChecker mc = null;
StateValues probs = null; StateValues probs = null;
PrismLog tmpLog; PrismLog tmpLog;
@ -1825,6 +1821,7 @@ public class Prism implements PrismSettingsListener
public void doTransient(Model model, double time, int exportType, File fileOut, File fileIn) throws PrismException public void doTransient(Model model, double time, int exportType, File fileOut, File fileIn) throws PrismException
{ {
long l = 0; // timer long l = 0; // timer
ModelChecker mc = null;
StateValues probs = null; StateValues probs = null;
PrismLog tmpLog; PrismLog tmpLog;

Loading…
Cancel
Save