From c5fa220048044b05b1f39d40e39eb83703a319ea Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Mon, 10 Jun 2013 12:26:08 +0000
Subject: [PATCH] Miscellaneous code changes/tidies - trying to align with
 prism-games a bit.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6880 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/explicit/ConstructModel.java | 27 +++++++++++++++++---------
 prism/src/explicit/MDPExplicit.java    | 10 +++++++---
 prism/src/explicit/ModelExplicit.java  |  7 +++++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/prism/src/explicit/ConstructModel.java b/prism/src/explicit/ConstructModel.java
index ce227a02..96f63830 100644
--- a/prism/src/explicit/ConstructModel.java
+++ b/prism/src/explicit/ConstructModel.java
@@ -27,13 +27,22 @@
 
 package explicit;
 
-import java.io.*;
-import java.util.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.LinkedList;
+import java.util.List;
 
-import parser.*;
-import parser.ast.*;
-import prism.*;
-import simulator.*;
+import parser.State;
+import parser.Values;
+import parser.ast.ModulesFile;
+import prism.ModelType;
+import prism.Prism;
+import prism.PrismException;
+import prism.PrismLog;
+import prism.PrismPrintStreamLog;
+import prism.ProgressDisplay;
+import prism.UndefinedConstants;
+import simulator.SimulatorEngine;
 
 public class ConstructModel
 {
@@ -46,9 +55,9 @@ public class ConstructModel
 	private boolean findDeadlocks = true;
 	// Automatically fix deadlocks?
 	private boolean fixDeadlocks = true;
-	
+
 	// Basic info needed about model
-	//	private ModelType modelType;
+	// private ModelType modelType;
 
 	// Details of built model
 	private List<State> statesList;
@@ -68,7 +77,7 @@ public class ConstructModel
 	{
 		fixDeadlocks = b;
 	}
-	
+
 	/**
 	 * Build the set of reachable states for a PRISM model language description and return.
 	 * @param modulesFile The PRISM model
diff --git a/prism/src/explicit/MDPExplicit.java b/prism/src/explicit/MDPExplicit.java
index 2dc226be..0da25afa 100644
--- a/prism/src/explicit/MDPExplicit.java
+++ b/prism/src/explicit/MDPExplicit.java
@@ -27,14 +27,18 @@
 
 package explicit;
 
-import java.util.*;
-import java.io.*;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
 
-import explicit.rewards.MDPRewards;
 import prism.ModelType;
 import prism.PrismException;
 import prism.PrismLog;
 import prism.PrismUtils;
+import explicit.rewards.MDPRewards;
 
 /**
  * Base class for explicit-state representations of an MDP.
diff --git a/prism/src/explicit/ModelExplicit.java b/prism/src/explicit/ModelExplicit.java
index 07201fb9..160cd56e 100644
--- a/prism/src/explicit/ModelExplicit.java
+++ b/prism/src/explicit/ModelExplicit.java
@@ -27,7 +27,10 @@
 package explicit;
 
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.List;
+import java.util.TreeSet;
 
 import parser.State;
 import parser.Values;
@@ -35,8 +38,8 @@ import parser.VarList;
 import prism.ModelType;
 import prism.Prism;
 import prism.PrismException;
-import prism.PrismLog;
 import prism.PrismFileLog;
+import prism.PrismLog;
 
 /**
  * Base class for explicit-state model representations.