From 4d4278fefeb57dad7d60b0c13b3b03f8d6a2d02e Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Fri, 10 Feb 2012 20:22:44 +0000 Subject: [PATCH] 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 --- prism/src/prism/Model.java | 2 +- prism/src/prism/NondetModelChecker.java | 8 ++------ prism/src/prism/ProbModel.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/prism/src/prism/Model.java b/prism/src/prism/Model.java index 4dbfee8a..b839b322 100644 --- a/prism/src/prism/Model.java +++ b/prism/src/prism/Model.java @@ -135,7 +135,7 @@ public interface Model void exportToFile(int exportType, boolean explicit, 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; - void exportStates(int exportType, PrismLog log) throws PrismException; + void exportStates(int exportType, PrismLog log); void clear(); } diff --git a/prism/src/prism/NondetModelChecker.java b/prism/src/prism/NondetModelChecker.java index 828c3e1b..7be74788 100644 --- a/prism/src/prism/NondetModelChecker.java +++ b/prism/src/prism/NondetModelChecker.java @@ -446,12 +446,8 @@ public class NondetModelChecker extends NonProbModelChecker } } if (prism.getExportProductStates()) { - try { - 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() + "\""); - } + mainLog.println("\nExporting product state space to file \"" + prism.getExportProductStatesFilename() + "\"..."); + modelProduct.exportStates(Prism.EXPORT_PLAIN, new PrismFileLog(prism.getExportProductStatesFilename())); } // Find accepting maximum end components diff --git a/prism/src/prism/ProbModel.java b/prism/src/prism/ProbModel.java index a3540eb4..f2a88a54 100644 --- a/prism/src/prism/ProbModel.java +++ b/prism/src/prism/ProbModel.java @@ -760,7 +760,7 @@ public class ProbModel implements Model } @Override - public void exportStates(int exportType, PrismLog log) throws PrismException + public void exportStates(int exportType, PrismLog log) { // Print header: list of model vars if (exportType == Prism.EXPORT_MATLAB)