Skip to content

Expose state sorting option in prism.Prism #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chrisnovakovic wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose state sorting option in prism.Prism #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions prism/src/prism/Prism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,11 @@ public void setFixDeadlocks(boolean b) throws PrismException
settings.set(PrismSettings.PRISM_FIX_DEADLOCKS, b);
}

public void setSortStates(boolean b) throws PrismException
{
settings.set(PrismSettings.PRISM_SORT_STATES, b);
}

public void setDoProbChecks(boolean b) throws PrismException
{
settings.set(PrismSettings.PRISM_DO_PROB_CHECKS, b);
Expand Down Expand Up @@ -730,6 +735,11 @@ public boolean getFixDeadlocks()
return settings.getBoolean(PrismSettings.PRISM_FIX_DEADLOCKS);
}

public boolean getSortStates()
{
return settings.getBoolean(PrismSettings.PRISM_SORT_STATES);
}

public boolean getDoProbChecks()
{
return settings.getBoolean(PrismSettings.PRISM_DO_PROB_CHECKS);
Expand Down Expand Up @@ -2014,6 +2024,7 @@ private void doBuildModel() throws PrismException
}
ConstructModel constructModel = new ConstructModel(this);
constructModel.setFixDeadlocks(getFixDeadlocks());
constructModel.setSortStates(getSortStates());
currentModelExpl = constructModel.constructModel(currentModelGenerator);
currentModel = null;
}
Expand All @@ -2029,6 +2040,7 @@ private void doBuildModel() throws PrismException
} else {
ConstructModel constructModel = new ConstructModel(this);
constructModel.setFixDeadlocks(getFixDeadlocks());
constructModel.setSortStates(getSortStates());
currentModelExpl = constructModel.constructModel(currentModelGenerator);
currentModel = null;
}
Expand Down
3 changes: 3 additions & 0 deletions prism/src/prism/PrismSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ public class PrismSettings implements Observer
public static final String PRISM_PROB1 = "prism.prob1";
public static final String PRISM_PRE_REL = "prism.preRel";
public static final String PRISM_FIX_DEADLOCKS = "prism.fixDeadlocks";
public static final String PRISM_SORT_STATES = "prism.sortStates";
public static final String PRISM_DO_PROB_CHECKS = "prism.doProbChecks";
public static final String PRISM_SUM_ROUND_OFF = "prism.sumRoundOff";
public static final String PRISM_COMPACT = "prism.compact";
Expand Down Expand Up @@ -278,6 +279,8 @@ public class PrismSettings implements Observer
"Constrain to fair adversaries when model checking MDPs." },
{ BOOLEAN_TYPE, PRISM_FIX_DEADLOCKS, "Automatically fix deadlocks", "4.0.3", new Boolean(true), "",
"Automatically fix deadlocks, where necessary, when constructing probabilistic models." },
{ BOOLEAN_TYPE, PRISM_SORT_STATES, "Sort reachable states", "4.4", new Boolean(true), "",
"Sort the list of reachable states when constructing probabilistic models." },
{ BOOLEAN_TYPE, PRISM_DO_PROB_CHECKS, "Do probability/rate checks", "2.1", new Boolean(true), "",
"Perform sanity checks on model probabilities/rates when constructing probabilistic models." },
{ DOUBLE_TYPE, PRISM_SUM_ROUND_OFF, "Probability sum threshold", "2.1", new Double(1.0E-5), "0.0,",
Expand Down