Refactor to the Casino library

SoftwareCats · Apr 5, 2021 · cd1f0f7 · cd1f0f7
1 parent 33d1de1
commit cd1f0f7
Show file tree

Hide file tree

Showing 27 changed files with 81 additions and 113 deletions.
diff --git a/.idea/Roulette.iml b/.idea/Roulette.iml
diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml
diff --git a/...__io_github_softwarecats_casino_0_1_1.xml → ...__io_github_softwarecats_casino_0_2_1.xml b/...__io_github_softwarecats_casino_0_1_1.xml → ...__io_github_softwarecats_casino_0_2_1.xml
diff --git a/pom.xml b/pom.xml
@@ -24,7 +24,7 @@
     <!-- Basic Configuration -->
     <groupId>io.github.softwarecats</groupId>
     <artifactId>roulette</artifactId>
-    <version>1.0.0</version>
+    <version>1.1.0</version>
 
     <dependencies>
         <dependency>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>io.github.softwarecats</groupId>
             <artifactId>casino</artifactId>
-            <version>0.1.1</version>
+            <version>0.2.1</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/io/github/softwarecats/roulette/Bet.java b/src/main/java/io/github/softwarecats/roulette/Bet.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import io.github.softwarecats.roulette.player.Player;
 
 import java.util.Objects;
@@ -65,7 +66,7 @@ public Bet(int amountBet, Outcome outcome, Player parent) {
      * @return amount won
      */
     public int winAmount() {
-        return amountBet + outcome.winAmount(amountBet);
+        return amountBet + outcome.winAmount(amountBet).intValue();
     }
 
     /**

diff --git a/src/main/java/io/github/softwarecats/roulette/Bin.java b/src/main/java/io/github/softwarecats/roulette/Bin.java
@@ -16,9 +16,10 @@
 
 package io.github.softwarecats.roulette;
 
-import java.util.Arrays;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.casino.event.RandomEvent;
+
 import java.util.Collection;
-import java.util.HashSet;
 
 /**
  * Bin contains a collection of Outcomes which reflect the winning bets that are paid for a particular bin on a Roulette
@@ -27,7 +28,7 @@
  * “Split 1-4” , “Street 1-2-3” , “Corner 1-2-4-5” , “Five Bet” , “Line 1-2-3-4-5-6” , “00-0-1-2-3” , “Dozen 1” , “Low”
  * and “Column 1” . These are collected into a single Bin .
  */
-public class Bin extends HashSet<Outcome> {
+public class Bin extends RandomEvent {
 
     /**
      * Instantiates an empty Bin. Outcomes can be added to it later.
@@ -43,7 +44,7 @@ public Bin() {
      * @param outcomes a primitive array of outcomes
      */
     public Bin(Outcome[] outcomes) {
-        super(Arrays.asList(outcomes));
+        super(outcomes);
     }
 
     /**
@@ -80,5 +81,4 @@ public boolean add(Outcome outcome) {
     public String toString() {
         return super.toString();
     }
-
 }
diff --git a/src/main/java/io/github/softwarecats/roulette/BinBuilder.java b/src/main/java/io/github/softwarecats/roulette/BinBuilder.java
@@ -16,6 +16,8 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
+
 import java.util.Set;
 
 /**

diff --git a/src/main/java/io/github/softwarecats/roulette/Outcome.java b/src/main/java/io/github/softwarecats/roulette/Outcome.java
diff --git a/src/main/java/io/github/softwarecats/roulette/Wheel.java b/src/main/java/io/github/softwarecats/roulette/Wheel.java
@@ -16,6 +16,8 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
+
 import java.util.*;
 
 /**

diff --git a/src/main/java/io/github/softwarecats/roulette/player/Cancellation.java b/src/main/java/io/github/softwarecats/roulette/player/Cancellation.java
@@ -16,7 +16,11 @@
 
 package io.github.softwarecats.roulette.player;
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 import java.util.ArrayDeque;
 import java.util.Deque;

diff --git a/src/main/java/io/github/softwarecats/roulette/player/Fibonacci.java b/src/main/java/io/github/softwarecats/roulette/player/Fibonacci.java
@@ -16,7 +16,11 @@
 
 package io.github.softwarecats.roulette.player;
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 /**
  * Fibonacci uses the Fibonacci betting system. This player allocates their available budget into a sequence

diff --git a/src/main/java/io/github/softwarecats/roulette/player/Martingale.java b/src/main/java/io/github/softwarecats/roulette/player/Martingale.java
@@ -16,7 +16,11 @@
 
 package io.github.softwarecats.roulette.player;
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 /**
  * Martingale is a Player who places bets in Roulette. This player doubles their bet on every loss and resets their

diff --git a/src/main/java/io/github/softwarecats/roulette/player/OneThreeTwoSix.java b/src/main/java/io/github/softwarecats/roulette/player/OneThreeTwoSix.java
@@ -17,7 +17,11 @@
 package io.github.softwarecats.roulette.player;
 
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/src/main/java/io/github/softwarecats/roulette/player/Passenger57.java b/src/main/java/io/github/softwarecats/roulette/player/Passenger57.java
@@ -16,7 +16,11 @@
 
 package io.github.softwarecats.roulette.player;
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 /**
  * Passenger57 constructs a Bet based on the Outcome named "Black".

diff --git a/src/main/java/io/github/softwarecats/roulette/player/Player.java b/src/main/java/io/github/softwarecats/roulette/player/Player.java
@@ -16,9 +16,9 @@
 
 package io.github.softwarecats.roulette.player;
 
+import io.github.softwarecats.casino.event.Outcome;
 import io.github.softwarecats.roulette.Bet;
 import io.github.softwarecats.roulette.InvalidBetException;
-import io.github.softwarecats.roulette.Outcome;
 import io.github.softwarecats.roulette.Table;
 
 import java.util.Set;

diff --git a/src/main/java/io/github/softwarecats/roulette/player/RandomChoice.java b/src/main/java/io/github/softwarecats/roulette/player/RandomChoice.java
@@ -16,7 +16,11 @@
 
 package io.github.softwarecats.roulette.player;
 
-import io.github.softwarecats.roulette.*;
+import io.github.softwarecats.casino.event.Outcome;
+import io.github.softwarecats.roulette.Bet;
+import io.github.softwarecats.roulette.Game;
+import io.github.softwarecats.roulette.InvalidBetException;
+import io.github.softwarecats.roulette.Table;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/src/main/java/io/github/softwarecats/roulette/player/SevenReds.java b/src/main/java/io/github/softwarecats/roulette/player/SevenReds.java
@@ -16,9 +16,9 @@
 
 package io.github.softwarecats.roulette.player;
 
+import io.github.softwarecats.casino.event.Outcome;
 import io.github.softwarecats.roulette.Game;
 import io.github.softwarecats.roulette.InvalidBetException;
-import io.github.softwarecats.roulette.Outcome;
 import io.github.softwarecats.roulette.Table;
 
 import java.util.Set;

diff --git a/src/test/java/io/github/softwarecats/roulette/BetTest.java b/src/test/java/io/github/softwarecats/roulette/BetTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;

diff --git a/src/test/java/io/github/softwarecats/roulette/BinTest.java b/src/test/java/io/github/softwarecats/roulette/BinTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import org.junit.Test;
 
 import java.util.ArrayList;

diff --git a/src/test/java/io/github/softwarecats/roulette/OutcomeTest.java b/src/test/java/io/github/softwarecats/roulette/OutcomeTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -27,7 +28,7 @@ public class OutcomeTest {
     public void winAmount() {
         Outcome outcome = new Outcome("Name", 2);
 
-        assertEquals(4, outcome.winAmount(2));
+        assertEquals(4, outcome.winAmount(2).intValue());
     }
 
     @Test

diff --git a/src/test/java/io/github/softwarecats/roulette/TableTest.java b/src/test/java/io/github/softwarecats/roulette/TableTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import org.junit.Test;
 
 import java.util.ArrayList;

diff --git a/src/test/java/io/github/softwarecats/roulette/WheelTest.java b/src/test/java/io/github/softwarecats/roulette/WheelTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette;
 
+import io.github.softwarecats.casino.event.Outcome;
 import org.junit.Before;
 import org.junit.Test;
 

diff --git a/src/test/java/io/github/softwarecats/roulette/player/MartingaleTest.java b/src/test/java/io/github/softwarecats/roulette/player/MartingaleTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette.player;
 
+import io.github.softwarecats.casino.event.Outcome;
 import io.github.softwarecats.roulette.*;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/src/test/java/io/github/softwarecats/roulette/player/OneThreeTwoSixTest.java b/src/test/java/io/github/softwarecats/roulette/player/OneThreeTwoSixTest.java
@@ -16,6 +16,7 @@
 
 package io.github.softwarecats.roulette.player;
 
+import io.github.softwarecats.casino.event.Outcome;
 import io.github.softwarecats.roulette.*;
 import org.junit.Before;
 import org.junit.Test;
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,8 @@ @@
     package io.github.softwarecats.roulette;
+    import io.github.softwarecats.casino.event.Outcome;
     import java.util.Set;
     /**
@@ Expand Down @@