Update/fix output of parsed model info.

Rewards included if unmamed, e.g.: "r1" 2 "r3".

So, for consistency, labels/observations displayed in quotes too.

prism/src/prism/Prism.java

@@ -1814,13 +1814,13 @@ private void printModelInfo(ModelInfo modelInfo, RewardGenerator<?> rewardInfo)
 		}
 		mainLog.println("Variables:   " + String.join(" ", modelInfo.getVarNames()));
 		if (modelInfo.getModelType().partiallyObservable()) {
-			mainLog.println("Observables: " + String.join(" ", modelInfo.getObservableNames()));
+			mainLog.println("Observables: " + "\"" + String.join("\" \"", modelInfo.getObservableNames()) + "\"");
 		}
 		if (modelInfo.getNumLabels() > 0) {
-			mainLog.println("Labels:      " + String.join(" ", modelInfo.getLabelNames()));
+			mainLog.println("Labels:      " + "\"" + String.join("\" \"", modelInfo.getLabelNames()) + "\"");
 		}
 		if (rewardInfo.getNumRewardStructs() > 0) {
-			mainLog.println("Rewards:     " + String.join(" ", rewardInfo.getRewardStructNames()));
+			mainLog.println("Rewards:     " + String.join(" ", rewardInfo.getRewardStructReferences()));
 		}
 	}
 

prism/src/prism/RewardGenerator.java

@@ -26,6 +26,7 @@
 
 package prism;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -80,7 +81,26 @@ public default List<String> getRewardStructNames()
 		// No reward structures by default
 		return Collections.emptyList();
 	}
-
+
+	/**
+	 * Get a list of the strings needed to reference the reward structures,
+	 * i.e., "r" for named ones and k for unnamed ones.
+	 */
+	public default List<String> getRewardStructReferences()
+	{
+		List<String> refs = new ArrayList<>();
+		int numRewards = getNumRewardStructs();
+		for (int r = 0; r < numRewards; r++) {
+			String name = getRewardStructName(r);
+			if ("".equals(name) || name == null) {
+				refs.add(Integer.toString(r + 1));
+			} else {
+				refs.add("\"" + name + "\"");
+			}
+		}
+		return refs;
+	}
+
 	/**
 	 * Get the number of reward structures.
 	 */