diff --git a/prism/src/prism/PrismCL.java b/prism/src/prism/PrismCL.java index 14905607..515acc1b 100644 --- a/prism/src/prism/PrismCL.java +++ b/prism/src/prism/PrismCL.java @@ -77,8 +77,7 @@ public class PrismCL implements PrismModelListener private boolean exportbsccs = false; private boolean exportmecs = false; private boolean exportresults = false; - private boolean exportresultsmatrix = false; - private boolean exportresultscsv = false; + private String exportResultsFormat = "plain"; private boolean exportPlainDeprecated = false; private boolean exportModelNoBasename = false; private int exportType = Prism.EXPORT_PLAIN; @@ -444,7 +443,7 @@ public class PrismCL implements PrismModelListener if (exportresults) { mainLog.print("\nExporting results "); - if (exportresultsmatrix) + if (exportResultsFormat.equals("matrix")) mainLog.print("in matrix form "); if (!exportResultsFilename.equals("stdout")) mainLog.println("to file \"" + exportResultsFilename + "\"..."); @@ -455,22 +454,21 @@ public class PrismCL implements PrismModelListener errorAndExit("Couldn't open file \"" + exportResultsFilename + "\" for output"); } - String sep = exportresultscsv ? ", " : "\t"; for (i = 0; i < numPropertiesToCheck; i++) { if (i > 0) tmpLog.println(); if (numPropertiesToCheck > 1) { - if (sep.equals(", ")) + if (exportResultsFormat.equals("csv")) tmpLog.print("\"" + propertiesToCheck.get(i) + ":\"\n"); else tmpLog.print(propertiesToCheck.get(i) + ":\n"); } - if (!exportresultsmatrix) { - ResultsExporter exporter = new ResultsExporter(exportresultscsv ? "csv" : "plain", "string"); + if (!exportResultsFormat.equals("matrix")) { + ResultsExporter exporter = new ResultsExporter(exportResultsFormat, "string"); tmpLog.println(results[i].export(exporter).getExportString()); //tmpLog.println(results[i].toString(false, sep, sep)); } else { - tmpLog.println(results[i].toStringMatrix(sep)); + tmpLog.println(results[i].toStringMatrix("\t")); } } tmpLog.close(); @@ -1142,12 +1140,15 @@ public class PrismCL implements PrismModelListener } exportResultsFilename = halves[0]; String ss[] = halves[1].split(","); + exportResultsFormat = "plain"; for (j = 0; j < ss.length; j++) { if (ss[j].equals("")) { } else if (ss[j].equals("csv")) - exportresultscsv = true; + exportResultsFormat = "csv"; else if (ss[j].equals("matrix")) - exportresultsmatrix = true; + exportResultsFormat = "matrix"; + else if (ss[j].equals("comment")) + exportResultsFormat = "comment"; else errorAndExit("Unknown option \"" + ss[j] + "\" for -" + sw + " switch"); }