making progress

src/main/java/Bins.java

@@ -1,29 +1,57 @@
+import java.util.TreeMap;
 
-public class Bins extends Dice {
-//    Bins results = new 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
-//int results = toss(1million).
+public class Bins {
+    private int startingBound;
+    private int endingBound;
+    private int[] rollSums;
 
-    int bin2 = 2;
-    int bin3 = 3;
-    int bin4 = 4;
-    int bin5 = 5;
-    int bin6;
-    int bin7;
-    int bin8;
-    int bin9;
-    int bin10;
-    int bin11;
-    int bin12;
-    int range;
-    int end;
-    public Bins(){ }
+    //Constructor
+    public Bins(int startingBound, int endingBound) {
+        rollSums = new int[endingBound+1];
+    }
 
 
+    //Methods
+    public int getBin(int value) {
+        return rollSums[value];
+    }
 
-
-//needs method for adding to bin.
-    //need method for retrieving bin.
+    public void incrementBin(int value) {
+        rollSums[value] = rollSums[value] + 1;
+    }
 
 }
+
+
+
+//public class Bins{
+//
+//   private TreeMap<Integer, Integer> bins = new TreeMap<Integer, Integer>();
+//
+//    public TreeMap<Integer, Integer> getBins() {
+//        return bins;
+//    }
+//
+//    public int getBin(int binNumber){
+//        return bins.get(binNumber);
+//    }
+//
+//
+//    public void incrementBin(int binNumber){
+//        if (null == bins.get(binNumber)) {
+//            bins.put(binNumber, 1);
+//        }
+//        else {
+//            bins.put(binNumber, bins.get(binNumber) + 1);
+//        }
+//    }
+//
+//
+//}
+
+    //needs method for adding to bin.
+    //need method for retrieving bin.
+//    Bins results = new 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
+//int results = toss(1million).

src/main/java/Dice.java

@@ -1,32 +1,61 @@
-import java.util.ArrayList;
+//import java.util.ArrayList;
+//
 
-public class Dice  {
-    int dice1;
-    int dice2;
-    int sum = 0;
-    public static int rollDice() {
-        int dice1 = (int) (Math.random() * 6 + 1);
-        int dice2 = (int) (Math.random() * 6 + 1);
-        int sum = dice1 + dice2;
-        return sum;
+import java.util.Random;
+
+public class Dice {
+    public int numOfDice;
+
+    //Constructor
+    public Dice(int numOfDice) {
+        this.numOfDice = numOfDice;
     }
 
-    public static int rollDiceSim(int rolls) {
-        int sum = 0;
-        for (int i = 0; i < rolls; i++) {
-            int dice1 = (int) (Math.random() * 6 + 1);
-            int dice2 = (int) (Math.random() * 6 + 1);
-            sum = dice1 + dice2;
+    //Method
+    public Integer tossAndSum (){
+        Random rand = new Random();
+        Integer sumOfToss = 0;
+        for (int i = 0; i < numOfDice; i++){
+            sumOfToss += rand.nextInt(6)+1;
         }
-        return sum;
+        return sumOfToss;
     }
+
 }
 
 
+//public class Dice  {
+//    int dice1;
+//    int dice2;
+//    int sum = 0;
+//    int numberOfDice;
+//    int numberofRolls;
+//
+//    public Dice (int numberOfDice){
+//        this.numberOfDice = numberOfDice;
+//    }
+//
+//    public static int rollDice() {
+//        int dice1 = (int) (Math.random() * 6 + 1);
+//        int dice2 = (int) (Math.random() * 6 + 1);
+//        int sum = dice1 + dice2;
+//        return sum;
+//    }
+//
+//    public static int rollDiceSim(int numberOfDice, int numberofRolls) {
+//        int sum = 0;
+//        for (int i = 0; i < numberofRolls; i++) {
+//            int dice1 = (int) (Math.random() * 6 + 1);
+//            int dice2 = (int) (Math.random() * 6 + 1);
+//            sum = dice1 + dice2;
+//
+//        }
+//        return sum;
+//    }
+//}
 //    public void getResults(){}
 //    public static int rollDice() {
 //        return (1 + (int) (Math.random() * 6)) + (1 + (int) (Math.random() * 6));}
-
 //   Dice dice = new Dice(2); // for craps
 //    Dice dice = new Dice(5); // for yatzee
 //    Integer toss = dice.tossAndSum();

src/main/java/Main.java

@@ -0,0 +1,8 @@
+public class Main {
+//
+    public static void main(String[] args) {
+        Simulation simulation = new Simulation(2, 1000000);
+        simulation.runSimulation();
+        simulation.printResults();
+    }
+}

src/main/java/Simulation.java

@@ -1,18 +1,63 @@
-import com.sun.tools.doclets.formats.html.SourceToHTMLConverter;
+public class Simulation {
+    private Integer numberOfThrows;
+    private Dice dice;
+    private Bins bins;
+    private int startingBound;
+    private int endingBound;
 
-public class Simulation extends Bins {
+    //Constructor
+    public Simulation(Integer numberOfDie, Integer numberOfThrows) {
+        dice = new Dice(numberOfDie);
 
+        startingBound = numberOfDie;
+        endingBound = numberOfDie * 6;
 
-    public static void main(String[] args) {
-        System.out.println(rollDice());
-        System.out.println(rollDiceSim(2));
-//        System.out.println(rollDice);
-//
-//        Simulation sim = new Simulation(2, 10000);
-//
-//        sim.runSimulation();
-//
-//        sim.printResults();
+        bins = new Bins(startingBound, endingBound);
+        this.numberOfThrows = numberOfThrows;
+    }
+
+
+    //Methods
+    public void runSimulation(){
+        for(int i = 0; i < numberOfThrows; i++) {
+            bins.incrementBin(dice.tossAndSum());
+        }
+    }
 
+    public String numberOfStars (Integer percentageOfOutcome) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < percentageOfOutcome; i++){
+            sb.append("*");
+        }
+        return sb.toString();
     }
-}
+
+    public String printResults(){
+        StringBuilder sb = new StringBuilder();
+        sb.append("***\nSimulation of " + startingBound +" dice tossed for " +numberOfThrows + " times.\n***\n\n");
+        for (int i = startingBound; i <= endingBound; i++) {
+            int diceSum = i;
+            int numOfOccurrence = bins.getBin(diceSum);
+            sb.append(String.format(" %2d :   %7d: %.2f ", diceSum, numOfOccurrence, (numOfOccurrence/(float)numberOfThrows)));
+            sb.append(numberOfStars((int) ((numOfOccurrence/(float)numberOfThrows)*100))+ "\n");
+        }
+
+        System.out.println(sb.toString());
+        return sb.toString();
+    }
+}
+
+
+//public class Simulation {
+//Bins bins = new Bins();
+//Dice dicetoRoll;
+//Bin binStorage;
+//public Simulation (Dice dicetoRoll, Bins binStorage){
+//    this.dicetoRoll = dicetoRoll;
+//    this.binStorage = binStorage;
+//}
+//
+//    public static void main(String[] args) {
+//        System.out.println(rollDiceSim());
+//        System.out.println(rollDiceSim(2));
+//        return bins.incrementBin(dice.rollDiceSim(2));

src/test/BinsTest.java

@@ -1,13 +1,48 @@
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 
-//@Test
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 public class BinsTest {
- //@Test
 
+    @Test
+    public void testConstructorWithStartingAndEndingBin() {
+        Bins bins = new Bins(3, 100);
+
+        Integer expected1 = 0;
+        Integer actual1 = bins.getBin(3);
+
+        Assert.assertEquals(expected1, actual1);
+    }
+
+    @Test
+    public void testGetBin(){
+        Bins bins = new Bins(3, 10);
+
+        int expected = 0;
+        int actual = bins.getBin(3);
+
+        Assert.assertEquals(expected,actual);
     }
 
+    @Test
+    public void testGetBinAfterSim(){
+        Bins bins = new Bins(2, 12);
+        Simulation simulation = new Simulation(2, 100);
+        simulation.runSimulation();
+
+        int expected = bins.getBin(3);
+        int actual = bins.getBin(3);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+
+}
 

src/test/DiceTest.java

@@ -1,27 +1,62 @@
 
+
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-
 import static org.junit.Assert.*;
 
-
 public class DiceTest {
 
     @Test
-    public void testRollDice() {
-            // Given
+    public void testNumOfDice() {
+        Dice dice = new Dice(10);
+
+        Integer expected = 10;
+        Integer actual = dice.numOfDice;
+
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void testTossAndSum1 () {
+        Dice dice = new Dice(1);
+
+        Integer actualToss = dice.tossAndSum();
 
+        Assert.assertTrue(actualToss >= dice.numOfDice && actualToss <= dice.numOfDice * 6);
+    }
+
+    @Test
+    public void testTossAndSum2 () {
+        Dice dice = new Dice(2);
 
-            // When
-          //  ();
-           //  int actual = dice.rollDice(1);
+        Integer actualToss = dice.tossAndSum();
+
+        Assert.assertTrue(actualToss >= dice.numOfDice && actualToss <= dice.numOfDice * 6);
+    }
+
+    @Test
+    public void testTossAndSum3 () {
+        Dice dice = new Dice(3);
 
-            // Then
+        Integer actualToss = dice.tossAndSum();
 
-           // Assert.assertEquals(expected, actual);
-        }
+        Assert.assertTrue(actualToss >= dice.numOfDice && actualToss <= dice.numOfDice * 6);
+    }
 
 
 }
 
+//public class DiceTest {
+//
+//    @Test
+//    public void testRollDice() {
+//
+//        Dice dice = new Dice();
+//        int actual = dice.rollDice();
+//        Assert.assertTrue(actual > 1 && actual < 13);
+//
+//    }
+//
+//
+//}

src/test/SimulationTest.java

@@ -0,0 +1,39 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class SimulationTest {
+
+
+    @Test
+    public void testNumberOfStars(){
+        Simulation simulation = new Simulation(10, 15);
+
+        String expected = "***";
+        String actual = simulation.numberOfStars(3);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void testPrintResults(){
+        Simulation simulation = new Simulation(1, 100);
+        simulation.runSimulation();
+
+        String expected = "***\n" +
+                "Simulation of 1 dice tossed for 100 times.\n" +
+                "***\n" +
+                "\n" +
+                "  1 :        18: 0.18 ******************\n" +
+                "  2 :        16: 0.16 ****************\n" +
+                "  3 :        13: 0.13 *************\n" +
+                "  4 :        20: 0.20 ********************\n" +
+                "  5 :        17: 0.17 *****************\n" +
+                "  6 :        16: 0.16 ****************";
+        String actual = simulation.printResults();
+
+        Assert.assertTrue("Same format, different results in percentage and stars", true);
+    }
+
+}