Miscellaneous code changes/tidies - trying to align with prism-games a bit.

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

prism/src/prism/ModelType.java

@@ -29,7 +29,7 @@ package prism;
 public enum ModelType {
 
 	// List of model types (ordered alphabetically)
-	CTMC, CTMDP, DTMC, MDP, PTA, STPG;
+	CTMC, CTMDP, DTMC, MDP, PTA, STPG, SMG;
 
 	/**
 	 * Get the full name, in words, of the this model type.
@@ -49,6 +49,8 @@ public enum ModelType {
 			return "probabilistic timed automaton";
 		case STPG:
 			return "stochastic two-player game";
+		case SMG:
+			return "stochastic multi-player game";
 		}
 		// Should never happen
 		return "";
@@ -72,6 +74,8 @@ public enum ModelType {
 			return "pta";
 		case STPG:
 			return "stpg";
+		case SMG:
+			return "smg";
 		}
 		// Should never happen
 		return "";
@@ -88,6 +92,7 @@ public enum ModelType {
 		case MDP:
 		case PTA:
 		case STPG:
+		case SMG:
 			return true;
 		case CTMC:
 		case CTMDP:
@@ -106,6 +111,7 @@ public enum ModelType {
 		case DTMC:
 		case MDP:
 		case STPG:
+		case SMG:
 			return false;
 		case PTA:
 		case CTMC:
@@ -127,6 +133,7 @@ public enum ModelType {
 			return false;
 		case MDP:
 		case STPG:
+		case SMG:
 		case PTA:
 		case CTMDP:
 			return true;
@@ -164,6 +171,8 @@ public enum ModelType {
 			return PTA;
 		else if ("stpg".equals(name))
 			return STPG;
+		else if ("smg".equals(name))
+			return SMG;
 		else
 			return null;
 	}

prism/src/prism/StateModelChecker.java

@@ -1308,8 +1308,7 @@ public class StateModelChecker implements ModelChecker
 				resVals = vals;
 				// Set vals to null to stop it being cleared below
 				vals = null;
-			}
-			else {
+			} else {
 				// Find first (only) value
 				d = vals.firstFromBDD(ddFilter);
 				// Store as object/vector