Clean up

prism/src/explicit/AccumulationContext.java

@@ -2,7 +2,6 @@ package explicit;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Vector;
 
 import explicit.rewards.MCRewards;
 import explicit.rewards.MDPRewards;

prism/src/explicit/AccumulationProduct.java

@@ -5,10 +5,7 @@ import java.util.BitSet;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Vector;
 
-import parser.ast.AccumulationTerm;
-import prism.IntegerBound;
 import prism.PrismException;
 
 import common.Dottable;

prism/src/explicit/AccumulationProductCounting.java

@@ -2,7 +2,6 @@ package explicit;
 
 import java.util.BitSet;
 import java.util.HashMap;
-import java.util.Vector;
 
 import explicit.rewards.Rewards;
 import prism.IntegerBound;

prism/src/explicit/AccumulationProductRegular.java

@@ -3,7 +3,6 @@ package explicit;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.HashMap;
-import java.util.Vector;
 
 import automata.finite.DeterministicFiniteAutomaton;
 import automata.finite.EdgeLabel;

prism/src/explicit/AccumulationTrack.java

@@ -1,9 +1,6 @@
 package explicit;
 
 import java.util.HashMap;
-import java.util.Vector;
-
-import explicit.rewards.Rewards;
 
 /**
  * An AccumulationTrack contains a map of weights

prism/src/explicit/AccumulationTransformation.java

@@ -3,7 +3,6 @@ package explicit;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.HashMap;
-import java.util.Vector;
 
 import common.StopWatch;
 import explicit.rewards.ConstructRewards;

prism/src/parser/ast/ExpressionAccumulationConstraint.java

@@ -149,15 +149,15 @@ public class ExpressionAccumulationConstraint extends Expression
 	{
 		switch (op) {
 		case BASIC:
-			return new Boolean(operand1.evaluateBoolean(ec));
+			return operand1.evaluateBoolean(ec);
 		case IMPLIES:
-			return new Boolean(!operand1.evaluateBoolean(ec) || operand2.evaluateBoolean(ec));
+			return !operand1.evaluateBoolean(ec) || operand2.evaluateBoolean(ec);
 		case OR:
-			return new Boolean(operand1.evaluateBoolean(ec) || operand2.evaluateBoolean(ec));
+			return operand1.evaluateBoolean(ec) || operand2.evaluateBoolean(ec);
 		case AND:
-			return new Boolean(operand1.evaluateBoolean(ec) && operand2.evaluateBoolean(ec));
+			return operand1.evaluateBoolean(ec) && operand2.evaluateBoolean(ec);
 		case NOT:
-			return new Boolean(!operand1.evaluateBoolean(ec));
+			return !operand1.evaluateBoolean(ec);
 		}
 		throw new PrismLangException("Unknown accumulation constraint operator", this);
 	}
@@ -202,7 +202,11 @@ public class ExpressionAccumulationConstraint extends Expression
 	@Override
 	public String toString()
 	{
-		return operand1 + opSymbols[op] + operand2;
+		String op1;
+		String op2;
+		if(operand1.op != BASIC) { op1 = "(" + operand1 + ")"; } else { op1 = operand1.toString(); }
+		if(operand2.op != BASIC) { op2 = "(" + operand2 + ")"; } else { op2 = operand2.toString(); }
+		return op1 + " " + opSymbols[op] + " " + op2;
 	}
 
 	@Override

prism/src/parser/visitor/EvaluateAccumulationConstraints.java

@@ -1,5 +1,10 @@
 package parser.visitor;
 
-public class EvaluateAccumulationConstraints extends ASTTraverseModify {
+import explicit.AccumulationTrack;
+import parser.ast.AccumulationTerm;
+import prism.IntegerBound;
+import prism.PrismException;
 
+public class EvaluateAccumulationConstraints<Component> extends ASTTraverseModify {
+	
 }