Browse Source

Change exportprodstates option to use Model not (old) Prism API.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4586 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 14 years ago
parent
commit
4d4278fefe
  1. 2
      prism/src/prism/Model.java
  2. 6
      prism/src/prism/NondetModelChecker.java
  3. 2
      prism/src/prism/ProbModel.java

2
prism/src/prism/Model.java

@ -135,7 +135,7 @@ public interface Model
void exportToFile(int exportType, boolean explicit, File file) throws FileNotFoundException, PrismException; void exportToFile(int exportType, boolean explicit, File file) throws FileNotFoundException, PrismException;
String exportStateRewardsToFile(int exportType, File file) throws FileNotFoundException, PrismException; String exportStateRewardsToFile(int exportType, File file) throws FileNotFoundException, PrismException;
String exportTransRewardsToFile(int exportType, boolean explicit, File file) throws FileNotFoundException, PrismException; String exportTransRewardsToFile(int exportType, boolean explicit, File file) throws FileNotFoundException, PrismException;
void exportStates(int exportType, PrismLog log) throws PrismException;
void exportStates(int exportType, PrismLog log);
void clear(); void clear();
} }

6
prism/src/prism/NondetModelChecker.java

@ -446,12 +446,8 @@ public class NondetModelChecker extends NonProbModelChecker
} }
} }
if (prism.getExportProductStates()) { if (prism.getExportProductStates()) {
try {
mainLog.println("\nExporting product state space to file \"" + prism.getExportProductStatesFilename() + "\"..."); mainLog.println("\nExporting product state space to file \"" + prism.getExportProductStatesFilename() + "\"...");
prism.exportStatesToFile(modelProduct, Prism.EXPORT_PLAIN, new File(prism.getExportProductStatesFilename()));
} catch (FileNotFoundException e) {
mainLog.printWarning("Could not export product state space to file \"" + prism.getExportProductStatesFilename() + "\"");
}
modelProduct.exportStates(Prism.EXPORT_PLAIN, new PrismFileLog(prism.getExportProductStatesFilename()));
} }
// Find accepting maximum end components // Find accepting maximum end components

2
prism/src/prism/ProbModel.java

@ -760,7 +760,7 @@ public class ProbModel implements Model
} }
@Override @Override
public void exportStates(int exportType, PrismLog log) throws PrismException
public void exportStates(int exportType, PrismLog log)
{ {
// Print header: list of model vars // Print header: list of model vars
if (exportType == Prism.EXPORT_MATLAB) if (exportType == Prism.EXPORT_MATLAB)

Loading…
Cancel
Save