completed lab

README.md

@@ -9,15 +9,15 @@ Integer toss = dice.tossAndSum();
 ```
 make a couple unit tests for the Dice class. 
 
-Create a tracking class `Bins` that can be used to track the results of dice tosses.
+Create a tracking class `Cuello.Xzavia.Bins` that can be used to track the results of dice tosses.
 
 ```
-Bins results = new Bins(2, 12); // for bins from 2..12
+Cuello.Xzavia.Bins results = new Cuello.Xzavia.Bins(2, 12); // for bins from 2..12
 Integer numberOfTens = results.getBin(10); // returns the number of tens in the 10 bin
 results.incrementBin(10); // should increment bin # 10
 
 ```
-make a couple unit tests for the Bins class. Your test methods should follow this template:
+make a couple unit tests for the Cuello.Xzavia.Bins class. Your test methods should follow this template:
 
     in the tests
     Create a new Bin

pom.xml

@@ -8,5 +8,14 @@
     <artifactId>Dicey-Lab</artifactId>
     <version>1.0-SNAPSHOT</version>
 
+<dependencies>
+    <!-- https://mvnrepository.com/artifact/junit/junit -->
+    <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.12</version>
+        <scope>test</scope>
+    </dependency>
 
+</dependencies>
 </project>

src/Test/Java/Cuello/Xzavia/BinsTest.java

@@ -0,0 +1,35 @@
+package Cuello.Xzavia;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+public class BinsTest {
+
+    @Test
+    public void constructorTest() {
+        //Given
+        Bins bins = new Bins(2, 12);
+
+        Integer actual = bins.bins.get(12);
+
+        Assert.assertTrue(actual == 0);
+    }
+
+    @Test
+    public void trackTossTest() {
+        //Given
+        Bins bins = new Bins(2,12);
+        Dice dice = new Dice(2);
+        Integer tossSum = dice.tossAndSum();
+        bins.trackToss(tossSum);
+
+        //When
+        Integer actual = bins.bins.get(tossSum);
+
+        //Then
+        Assert.assertTrue(actual ==1);
+
+    }
+}

src/Test/Java/Cuello/Xzavia/DiceTest.java

@@ -0,0 +1,29 @@
+package Cuello.Xzavia;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DiceTest {
+
+    @Test
+    public void getNumberOfDiceTest() {
+        //Given
+        Dice dice = new Dice(2);
+
+        Integer expected = 2;
+
+        Integer actual = dice.getNumberOfDice();
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void tossAndSumTest() {
+        //Given
+        Dice dice = new Dice(2);
+
+        Integer actual = dice.tossAndSum();
+
+        Assert.assertTrue(actual >= 2 && actual <= 12);
+    }
+}

src/Test/Java/Cuello/Xzavia/DieTest.java

@@ -0,0 +1,24 @@
+package Cuello.Xzavia;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class DieTest {
+
+    @Test
+    public void rollTest() {
+        //Given
+        Die die = new Die();
+        Integer actual = die.toss();
+
+        Assert.assertTrue(actual >= 1 && actual <= 6);
+    }
+    @Test
+    public void roll20Test() {
+        //Given
+        Die die = new Die();
+        Integer actual = die.toss();
+
+        Assert.assertTrue(actual >= 1 && actual <= 20);
+    }
+}

src/Test/Java/SimulationTest.java

@@ -0,0 +1,12 @@
+import Cuello.Xzavia.Simulation;
+import org.junit.Test;
+
+public class SimulationTest {
+
+    @Test
+    public void simulationTest() {
+
+        Simulation simulation = new Simulation(2, 100);
+        simulation.runSimulation();
+    }
+}

src/main/java/Bins.java

@@ -1,4 +0,0 @@
-
-public class Bins {
-
-}

src/main/java/Cuello/Xzavia/Bins.java

@@ -0,0 +1,33 @@
+package Cuello.Xzavia;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Bins {
+
+    HashMap<Integer, Integer> bins;
+
+    public Bins(Integer min, Integer max) {
+
+        bins = new HashMap<Integer, Integer>();
+
+        initializeBins(min, max);
+    }
+
+    private void initializeBins(Integer min, Integer max) {
+        for(int i = min; i <= max; i++) {
+
+            bins.put(i, 0);
+        }
+
+
+
+        }
+
+
+
+    public void trackToss(int tossSum) {
+
+        bins.put(tossSum, bins.get(tossSum) + 1);
+    }
+}

src/main/java/Cuello/Xzavia/Dice.java

@@ -0,0 +1,39 @@
+package Cuello.Xzavia;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+public class Dice {
+
+    ArrayList<Die> dice;
+
+    public Dice(Integer number) {
+        dice = new ArrayList<Die>();
+        initializeDice(number);
+
+    }
+
+    private void initializeDice(Integer number) {
+        for(int i = 0; i < number; i++) {
+            Die die = new Die();
+            dice.add(die);
+        }
+    }
+
+    public Integer getNumberOfDice() {
+
+        return dice.size();
+    }
+
+    public Integer tossAndSum() {
+        Integer sum = 0;
+        for(Die die : dice) {
+            sum += die.toss();
+        }
+
+
+        return sum;
+
+    }
+
+}

src/main/java/Cuello/Xzavia/Die.java

@@ -0,0 +1,23 @@
+package Cuello.Xzavia;
+
+import java.util.Random;
+
+public class Die {
+    int sides;
+
+    public Die(Integer sides){
+        this.sides = sides;
+
+    }
+
+    public Die() {
+        this(6);
+
+    }
+
+    public Integer toss() {
+        Random random = new Random();
+
+        return random.nextInt(6) + 1;
+    }
+}

src/main/java/Cuello/Xzavia/Main.java

@@ -0,0 +1,11 @@
+package Cuello.Xzavia;
+
+public class Main {
+
+    public static void main(String[] args) {
+        Simulation simulation = new Simulation(2, 1000000);
+        simulation.runSimulation();
+
+        System.out.println(simulation.bins.bins);
+    }
+}

src/main/java/Cuello/Xzavia/Simulation.java

@@ -0,0 +1,44 @@
+package Cuello.Xzavia;
+
+public class Simulation {
+
+    //Simulation sim = new Simulation(2, 10000);
+
+//sim.runSimulation();
+
+//sim.printResults();
+
+    private int numberOfDie;
+    private int numberOfTosses;
+    Dice dice;
+    Bins bins;
+
+    public Simulation(int numberOfDie,int numberOfTosses) {
+
+        this.numberOfDie = numberOfDie;
+        this.numberOfTosses = numberOfTosses;
+        this.dice = new Dice(numberOfDie);
+        this.bins = new Bins(numberOfDie, numberOfDie * 6);
+
+        Dice dice = new Dice(numberOfDie);
+        Bins bins = new Bins(numberOfDie, numberOfDie * 6);
+    }
+
+    public void runSimulation() {
+
+        for(int i = 1; i <= numberOfTosses; i++) {
+
+            bins.trackToss(dice.tossAndSum());
+
+        }
+
+    }
+
+    public Bins returnResults() {
+        return this.bins;
+    }
+
+
+
+
+}

src/main/java/Dice.java

@@ -1,4 +0,0 @@
-public class Dice {
-
-
-}

src/main/java/Simulation.java

@@ -1,5 +0,0 @@
-public class Simulation {
-
-
-
-}