Added -exportresultscsv and -exportresultsmatrixcsv to command-line

(but might change these names later).


git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@4476 bbc10eb1-c90d-0410-af57-cb519fbb1720

prism/src/prism/PrismCL.java

@@ -62,6 +62,7 @@ public class PrismCL
 	private boolean exportbsccs = false;
 	private boolean exportresults = false;
 	private boolean exportresultsmatrix = false;
+	private boolean exportresultscsv = false;
 	private boolean exportprism = false;
 	private boolean exportprismconst = false;
 	private boolean exportPlainDeprecated = false;
@@ -504,8 +505,7 @@ public class PrismCL
 				errorAndExit("Couldn't open file \"" + exportResultsFilename + "\" for output");
 			}
 			
-			boolean csv = false;
-			String sep = csv ? ", " : "\t";
+			String sep = exportresultscsv ? ", " : "\t";
 			for (i = 0; i < numPropertiesToCheck; i++) {
 				if (i > 0)
 					tmpLog.println();
@@ -1271,6 +1271,15 @@ public class PrismCL
 						errorAndExit("No file specified for -" + sw + " switch");
 					}
 				}
+				else if (sw.equals("exportresultscsv")) {
+					if (i < args.length - 1) {
+						exportresults = true;
+						exportresultscsv = true;
+						exportResultsFilename = args[++i];
+					} else {
+						errorAndExit("No file specified for -" + sw + " switch");
+					}
+				}
 				// export results, in matrix form
 				else if (sw.equals("exportresultsmatrix")) {
 					if (i < args.length - 1) {
@@ -1281,6 +1290,17 @@ public class PrismCL
 						errorAndExit("No file specified for -" + sw + " switch");
 					}
 				}
+				// export results, in matrix form
+				else if (sw.equals("exportresultsmatrixcsv")) {
+					if (i < args.length - 1) {
+						exportresults = true;
+						exportresultsmatrix = true;
+						exportresultscsv = true;
+						exportResultsFilename = args[++i];
+					} else {
+						errorAndExit("No file specified for -" + sw + " switch");
+					}
+				}
 				// export transition matrix to file
 				else if (sw.equals("exporttrans")) {
 					if (i < args.length - 1) {