Browse Source

Make sure that some PrismFileLogs are close()ed after use - spotted as a bug by Bruno.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@8168 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 12 years ago
parent
commit
dfce095d45
  1. 2
      prism/src/explicit/MDPModelChecker.java
  2. 1
      prism/src/explicit/STPGModelChecker.java
  3. 4
      prism/src/prism/NondetModelChecker.java
  4. 4
      prism/src/prism/ProbModelChecker.java
  5. 2
      prism/src/simulator/SimulatorEngine.java

2
prism/src/explicit/MDPModelChecker.java

@ -584,6 +584,7 @@ public class MDPModelChecker extends ProbModelChecker
// Export
PrismLog out = new PrismFileLog(exportAdvFilename);
new DTMCFromMDPMemorylessAdversary(mdp, strat).exportToPrismExplicitTra(out);
out.close();
}
// Update time taken
@ -1481,6 +1482,7 @@ public class MDPModelChecker extends ProbModelChecker
// Export
PrismLog out = new PrismFileLog(exportAdvFilename);
new DTMCFromMDPMemorylessAdversary(mdp, strat).exportToPrismExplicitTra(out);
out.close();
}
// Finished expected reachability

1
prism/src/explicit/STPGModelChecker.java

@ -644,6 +644,7 @@ public class STPGModelChecker extends ProbModelChecker
out.println(i + " " + (adv[i] != -1 ? stpg.getAction(i, adv[i]) : "-"));
}
out.println();
out.close();
}
// Return results

4
prism/src/prism/NondetModelChecker.java

@ -1495,7 +1495,9 @@ public class NondetModelChecker extends NonProbModelChecker
}
if (prism.getExportProductStates()) {
mainLog.println("\nExporting product state space to file \"" + prism.getExportProductStatesFilename() + "\"...");
modelProduct.exportStates(Prism.EXPORT_PLAIN, new PrismFileLog(prism.getExportProductStatesFilename()));
PrismFileLog out = new PrismFileLog(prism.getExportProductStatesFilename());
modelProduct.exportStates(Prism.EXPORT_PLAIN, out);
out.close();
}
// Find accepting MECs + compute reachability probabilities

4
prism/src/prism/ProbModelChecker.java

@ -603,7 +603,9 @@ public class ProbModelChecker extends NonProbModelChecker
}
if (prism.getExportProductStates()) {
mainLog.println("\nExporting product state space to file \"" + prism.getExportProductStatesFilename() + "\"...");
modelProduct.exportStates(Prism.EXPORT_PLAIN, new PrismFileLog(prism.getExportProductStatesFilename()));
PrismFileLog out = new PrismFileLog(prism.getExportProductStatesFilename());
modelProduct.exportStates(Prism.EXPORT_PLAIN, out);
out.close();
}
// Find accepting BSCCs + compute reachability probabilities

2
prism/src/simulator/SimulatorEngine.java

@ -1319,6 +1319,8 @@ public class SimulatorEngine extends PrismComponent
log.println();
}
((PathFull) path).exportToLog(log, timeCumul, colSep, vars);
if (file != null)
log.close();
}
/**

Loading…
Cancel
Save