Renamed packages to suit updated project

1 files changed, 0 insertions, 83 deletions

diff --git a/dice-lang/src/bjc/utils/dice/CompoundDiceExpression.java b/dice-lang/src/bjc/utils/dice/CompoundDiceExpression.java
deleted file mode 100644
index 41b1df2..0000000
--- a/dice-lang/src/bjc/utils/dice/CompoundDiceExpression.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package bjc.utils.dice;
-
-/**
- * Implements a class for combining two dice with an operator
- * 
- * @author ben
- *
- */
-public class CompoundDiceExpression implements IDiceExpression {
-	/**
-	 * The operator to use for combining the dice
-	 */
-	private DiceExpressionType	det;
-
-	/**
-	 * The dice on the left side of the expression
-	 */
-	private IDiceExpression		left;
-
-	/**
-	 * The dice on the right side of the expression
-	 */
-	private IDiceExpression		right;
-
-	/**
-	 * Create a new compound expression using the specified parameters
-	 * 
-	 * @param right
-	 *            The die on the right side of the expression
-	 * @param left
-	 *            The die on the left side of the expression
-	 * @param det
-	 *            The operator to use for combining the dices
-	 */
-	public CompoundDiceExpression(IDiceExpression right,
-			IDiceExpression left, DiceExpressionType det) {
-		this.right = right;
-		this.left = left;
-		this.det = det;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see bjc.utils.dice.IDiceExpression#roll()
-	 */
-	@Override
-	public int roll() {
-		/*
-		 * Handle each operator
-		 */
-		switch (det) {
-			case ADD:
-				return right.roll() + left.roll();
-			case SUBTRACT:
-				return right.roll() - left.roll();
-			case MULTIPLY:
-				return right.roll() * left.roll();
-			case DIVIDE:
-				/*
-				 * Round to keep results as integers. We don't really have
-				 * any need for floating-point dice
-				 */
-				return Math.round(right.roll() / left.roll());
-			default:
-				throw new IllegalArgumentException(
-						"Got passed  a invalid ScalarExpressionType " + det
-								+ ". WAT");
-
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.lang.Object#toString()
-	 */
-	@Override
-	public String toString() {
-		return "dice-exp[type=" + det + ", l=" + left.toString() + ", r="
-				+ right.toString() + "]";
-	}
-}