Merge d0a389d12361cec8ff3922aa4d9e44380402ab85 into 1eaff706f0dcc7a467d1c6648bcb494e313ba6a5

pom.xml

@@ -7,6 +7,31 @@
     <groupId>com.zipcodewilmington</groupId>
     <artifactId>Dicey-Lab</artifactId>
     <version>1.0-SNAPSHOT</version>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
 
 
-</project>
+</project>
+
+<!--<?xml version="1.0" encoding="UTF-8"?>-->
+<!--<project xmlns="http://maven.apache.org/POM/4.0.0"-->
+         <!--xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"-->
+         <!--xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">-->
+    <!--<modelVersion>4.0.0</modelVersion>-->
+
+    <!--<groupId>com.zipcodewilmington</groupId>-->
+    <!--<artifactId>Dicey-Lab</artifactId>-->
+    <!--<version>1.0-SNAPSHOT</version>-->
+
+
+<!--</project>-->

src/main/java/Bins.java

@@ -1,4 +1,27 @@
+import java.util.TreeMap;
 
 public class Bins {
 
+    int minIndex;
+    int maxIndex;
+
+    private int[] results;
+
+    public Bins (int minIndex, int maxIndex) {
+        results = new int[maxIndex +1];
+    }
+
+    public int getBins(int outcome) {
+        return results[outcome];
+    }
+
+    public void incrementBin(int outcome) {
+        results[outcome]++;
+    }
+
 }
+
+
+//    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

src/main/java/DanielResults.md

@@ -0,0 +1,15 @@
+***
+Simulation of 2 dice tossed for 1000000 times.
+***
+
+  2 :     27854: 0.03**
+  3 :     55661: 0.06*****
+  4 :     83465: 0.08********
+  5 :    110837: 0.11***********
+  6 :    138840: 0.14*************
+  7 :    166577: 0.17****************
+  8 :    139243: 0.14*************
+  9 :    111241: 0.11***********
+ 10 :     82793: 0.08********
+ 11 :     55743: 0.06*****
+ 12 :     27746: 0.03**

src/main/java/Dice.java

@@ -1,4 +1,22 @@
+
+
 public class Dice {
 
+    int numOfDie;
+
+    public Dice () {
+
+    }
+
+    public int rollDice(int numOfDie) {
+        Dice dice1 = new Dice();
+        int sumOfRoll = 0;
+        for (int roll = 1; roll <= numOfDie; roll++) {
+            sumOfRoll += (int) (Math.random() * 6 + 1);
+        }
+        return sumOfRoll;
+
+    }
+
 
 }

src/main/java/Simulation.java

@@ -1,5 +1,71 @@
-public class Simulation {
+public class Simulation extends Dice {
 
+    private int numberOfRolls;
+    private int numberOfDice;
+    private Dice dice;
+    private Bins bins;
+    private int minIndex;
+    private int maxIndex;
 
 
-}
+    public Simulation() {
+
+    }
+
+    public Simulation (int numberOfDice, int minIndex) {
+        dice = new Dice();
+
+        minIndex = numberOfDice;
+        maxIndex = numberOfDice * 6;
+
+        bins = new Bins(minIndex, maxIndex);
+
+        this.numberOfRolls = numberOfRolls;
+          }
+
+    public void runSimulation (int numberOfRolls, int rollsOfDie) {
+
+        for (int i = 0; i < numberOfRolls; i++)
+            bins.incrementBin(dice.rollDice(rollsOfDie));
+
+        }
+
+     public String printIt(int minIndex, int maxIndex, int numberOfRolls) {
+         StringBuilder sb = new StringBuilder();
+             sb.append("***\nSimulation of " + minIndex +" dice tossed for " + numberOfRolls + " times.\n***\n\n");
+        for (int y = minIndex; y <= maxIndex; y++){
+            int diceSum = y;
+            int numOfOccurrence = bins.getBins(diceSum);
+            sb.append(String.format(" %2d :   %7d: %.2f", diceSum, numOfOccurrence, (numOfOccurrence/(float)numberOfRolls)));
+            sb.append(numberOfStars((int) ((numOfOccurrence/(float)numberOfRolls)*100))+ "\n");
+         }
+
+         System.out.println(sb.toString());
+            return sb.toString();
+
+     }
+
+     public String numberOfStars(int percentOutcome){
+        StringBuilder sb1 = new StringBuilder();
+        for (int otc = 0; otc < percentOutcome; otc++) {
+            sb1.append("*");
+        }
+        return sb1.toString();
+     }
+
+
+
+    public static void main(String[] args) {
+        Simulation simulation = new Simulation(2,2);
+        simulation.runSimulation(1000000,2);
+        simulation.printIt(2,12,1000000);
+
+
+
+
+
+
+    }
+
+    }
+

src/test/BinsTest.java

@@ -0,0 +1,26 @@
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.Assert;
+
+import static org.junit.Assert.*;
+
+public class BinsTest {
+
+    @Before
+    public void setUp() throws Exception {
+        Bins bins = new Bins(2, 12);
+        Integer expected1 = 0;
+        Integer actual1 = bins.getBins(3);
+        Assert.assertEquals(expected1, actual1);
+
+    }
+
+    @Test
+    public void getBins() {
+
+    }
+
+    @Test
+    public void incrementBin() {
+    }
+}

src/test/SimulationTest.java

@@ -0,0 +1,27 @@
+import org.junit.Assert;
+import org.junit.Test;
+
+public class SimulationTest {
+
+    @Test
+    public void runSimulation() {
+
+
+
+    }
+
+    public static class DiceTest {
+
+        @Test
+        public void rollDice() {
+            Dice dice = new Dice();
+
+            Integer actual = dice.rollDice(2);
+
+            Assert.assertTrue(actual >= 2 && actual <= 12);
+
+
+
+        }
+    }
+}