s14h
/
prism-accumulation
1
0
Fork 0
Code Releases Activity
Browse Source

Code tidy: change out-of-date variable names.

accumulation-v4.7
Dave Parker 6 years ago
parent
9bbfd96b54
commit
268f31621a
2 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      prism/src/simulator/PathFull.java
  2. 12
      prism/src/simulator/PathOnTheFly.java

16
prism/src/simulator/PathFull.java
View File

@ -44,7 +44,7 @@ import userinterface.graph.Graph;
public class PathFull extends Path implements PathFullInfo public class PathFull extends Path implements PathFullInfo
{ {
// Model to which the path corresponds // Model to which the path corresponds
private ModelInfo modulesFile;
private ModelInfo modelInfo;
private RewardGenerator rewardGen; private RewardGenerator rewardGen;
// Does model use continuous time? // Does model use continuous time?
private boolean continuousTime; private boolean continuousTime;
@ -62,11 +62,11 @@ public class PathFull extends Path implements PathFullInfo
/** /**
* Constructor: creates a new (empty) PathFull object for a specific model. * Constructor: creates a new (empty) PathFull object for a specific model.
*/ */
public PathFull(ModelInfo modulesFile, RewardGenerator rewardGen)
public PathFull(ModelInfo modelInfo, RewardGenerator rewardGen)
{ {
// Store model and info // Store model and info
this.modulesFile = modulesFile;
continuousTime = modulesFile.getModelType().continuousTime();
this.modelInfo = modelInfo;
continuousTime = modelInfo.getModelType().continuousTime();
this.rewardGen = rewardGen; this.rewardGen = rewardGen;
numRewardStructs = rewardGen.getNumRewardStructs(); numRewardStructs = rewardGen.getNumRewardStructs();
// Create list to store path // Create list to store path
@ -453,7 +453,7 @@ public class PathFull extends Path implements PathFullInfo
public void display(PathDisplayer displayer) throws PrismException public void display(PathDisplayer displayer) throws PrismException
{ {
// In the absence of model info, do nothing // In the absence of model info, do nothing
if (modulesFile == null) {
if (modelInfo == null) {
return; return;
} }
// Display path // Display path
@ -478,7 +478,7 @@ public class PathFull extends Path implements PathFullInfo
public void displayThreaded(PathDisplayer displayer) throws PrismException public void displayThreaded(PathDisplayer displayer) throws PrismException
{ {
// In the absence of model info, do nothing // In the absence of model info, do nothing
if (modulesFile == null) {
if (modelInfo == null) {
return; return;
} }
// Display path // Display path
@ -507,7 +507,7 @@ public class PathFull extends Path implements PathFullInfo
*/ */
public void exportToLog(PrismLog log, boolean showTimeCumul, boolean showRewards, String colSep, ArrayList<Integer> vars) throws PrismException public void exportToLog(PrismLog log, boolean showTimeCumul, boolean showRewards, String colSep, ArrayList<Integer> vars) throws PrismException
{ {
PathToText displayer = new PathToText(log, modulesFile, rewardGen);
PathToText displayer = new PathToText(log, modelInfo, rewardGen);
displayer.setShowTimeCumul(showTimeCumul); displayer.setShowTimeCumul(showTimeCumul);
displayer.setColSep(colSep); displayer.setColSep(colSep);
displayer.setVarsToShow(vars); displayer.setVarsToShow(vars);
@ -521,7 +521,7 @@ public class PathFull extends Path implements PathFullInfo
*/ */
public void plotOnGraph(Graph graphModel) throws PrismException public void plotOnGraph(Graph graphModel) throws PrismException
{ {
PathToGraph displayer = new PathToGraph(graphModel, modulesFile, rewardGen);
PathToGraph displayer = new PathToGraph(graphModel, modelInfo, rewardGen);
displayThreaded(displayer); displayThreaded(displayer);
} }

12
prism/src/simulator/PathOnTheFly.java
View File

@ -38,7 +38,7 @@ import prism.RewardGenerator;
public class PathOnTheFly extends Path public class PathOnTheFly extends Path
{ {
// Model to which the path corresponds // Model to which the path corresponds
protected ModelInfo modulesFile;
protected ModelInfo modelInfo;
// Does model use continuous time? // Does model use continuous time?
protected boolean continuousTime; protected boolean continuousTime;
// Model info/stats // Model info/stats
@ -64,15 +64,15 @@ public class PathOnTheFly extends Path
/** /**
* Constructor: creates a new (empty) PathOnTheFly object for a specific model. * Constructor: creates a new (empty) PathOnTheFly object for a specific model.
*/ */
public PathOnTheFly(ModelInfo modulesFile, RewardGenerator rewardGen)
public PathOnTheFly(ModelInfo modelInfo, RewardGenerator rewardGen)
{ {
// Store model and info // Store model and info
this.modulesFile = modulesFile;
continuousTime = modulesFile.getModelType().continuousTime();
this.modelInfo = modelInfo;
continuousTime = modelInfo.getModelType().continuousTime();
numRewardStructs = rewardGen.getNumRewardStructs(); numRewardStructs = rewardGen.getNumRewardStructs();
// Create State objects for current/previous state // Create State objects for current/previous state
previousState = new State(modulesFile.getNumVars());
currentState = new State(modulesFile.getNumVars());
previousState = new State(modelInfo.getNumVars());
currentState = new State(modelInfo.getNumVars());
// Create arrays to store totals // Create arrays to store totals
totalRewards = new double[numRewardStructs]; totalRewards = new double[numRewardStructs];
previousStateRewards = new double[numRewardStructs]; previousStateRewards = new double[numRewardStructs];

Write Preview
Loading…
Cancel
Save