From 5865c0fd894e94899b93b54ccfa4402bcd9d6a13 Mon Sep 17 00:00:00 2001 From: Dave Parker Date: Wed, 7 Jan 2015 17:06:45 +0000 Subject: [PATCH] Bug fix in exporting product during multi-objective model checking. git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@9504 bbc10eb1-c90d-0410-af57-cb519fbb1720 --- prism/src/prism/NondetModelChecker.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/prism/src/prism/NondetModelChecker.java b/prism/src/prism/NondetModelChecker.java index 2b082ee5..61b1365f 100644 --- a/prism/src/prism/NondetModelChecker.java +++ b/prism/src/prism/NondetModelChecker.java @@ -627,18 +627,16 @@ public class NondetModelChecker extends NonProbModelChecker if (prism.getExportProductTrans()) { try { mainLog.println("\nExporting product transition matrix to file \"" + prism.getExportProductTransFilename() + "\"..."); - prism.exportTransToFile(modelProduct, true, Prism.EXPORT_PLAIN, new File(prism.getExportProductTransFilename())); + modelProduct.exportToFile(Prism.EXPORT_PLAIN, true, new File(prism.getExportProductTransFilename())); } catch (FileNotFoundException e) { mainLog.printWarning("Could not export product transition matrix to file \"" + prism.getExportProductTransFilename() + "\""); } } 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() + "\"..."); + PrismFileLog out = new PrismFileLog(prism.getExportProductStatesFilename()); + modelProduct.exportStates(Prism.EXPORT_PLAIN, out); + out.close(); } }