Merge 0ba3b812e56c7c41d667c172417f59d243df6f20 into 1eaff706f0dcc7a467d1c6648bcb494e313ba6a5

pom.xml

@@ -8,5 +8,15 @@
     <artifactId>Dicey-Lab</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+
+    </dependencies>
+
 
 </project>

src/main/java/Bins.java

@@ -1,4 +1,21 @@
+import java.util.HashMap;
 
 public class Bins {
 
+    protected HashMap<Integer, Integer> numOfTimesWeveRolledEachNUm = new HashMap<Integer, Integer>();
+
+    public Bins(Integer smallestPossible, Integer largestPossible){
+        for (Integer key = smallestPossible; key <= largestPossible; key++){
+            numOfTimesWeveRolledEachNUm.put(key, 0);
+        }
+    }
+
+    public Bins(int start, int end) {
+
+
+    }
+
+    public Integer getBin(int numToCheck) {
+        return null;
+    }
 }

src/main/java/Dice.java

@@ -1,4 +1,53 @@
 public class Dice {
 
+    private int numOfDice;
+    private int minNum;
+    private int maxNum;
 
+
+    public Dice(){
+        this(1);
+    }
+
+    public Dice(int numOfDice){
+        this.numOfDice = numOfDice;
+        this.minNum= numOfDice;
+        this.maxNum = numOfDice * 6;
+    }
+
+    public int getMinNum() {
+        return minNum;
+    }
+
+    public int getMaxNum() {
+        return maxNum;
+    }
+
+    public int tossAndSum(){
+        int rollSum = 0;
+        for (int i = 0; i <numOfDice; i++){
+            rollSum += (int) (Math.random() *6) + 1;
+        }
+
+        return rollSum;
+
+    }
+
+    public static void main(String[] args) {
+        Dice dice = new Dice(2); // for craps
+        Dice dice2 = new Dice(5); // for yatzee
+
+        Integer toss = dice.tossAndSum();
+        Integer toss2 = dice2.tossAndSum();
+
+        System.out.println("The result of the first toss was " + toss);
+        System.out.println("The result of the second toss was " + toss2);
+
+
+
+    }
+
+//    public int rollDice(int numDice) {
+//        return (int) (Math.random()*numDice*6);
+//    }
 }

src/main/java/Simulation.java

@@ -1,5 +1,6 @@
 public class Simulation {
 
 
-
+    public Simulation(int numDice, int numTosses) {
+    }
 }

src/test/java/BinsTest.java

@@ -0,0 +1,29 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BinsTest {
+    @Test
+    public void binsTest() {
+        Bins results = new Bins(2,12);
+
+        int expected = -1;
+        int actual = -2;
+
+        Assert.assertEquals(expected,actual);
+
+    }
+
+    @Test
+    public void numOfTensTest(){
+        Bins results = new Bins(2,12);
+        Integer numberOfTens = results.getBin(10);
+    }
+
+//    @Test
+//    public void incrementBinsTest(){
+//        Bins results;
+//        results.incrementBin(10);
+//    }
+
+
+}

src/test/java/DiceTest.java

@@ -0,0 +1,19 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+//public class DiceTest {
+//    @Test
+//    public void rollTest() {
+//        //Given
+//            //a Dice Object and supply number of dice
+//            Dice testDice = new Dice(2);
+//        //When
+//            //I roll it/them
+////        testDice.rollDice(2);
+////        //Then
+////            //I want it to give me a random number
+////        int actual = testDice.rollDice(2);
+////
+////        Assert.assertTrue(actual >=12);
+////    }
+////}

src/test/java/SimulationTest.java

@@ -0,0 +1,3 @@
+public class SimulationTest {
+    Simulation sim = new Simulation(2, 10000);
+}