Merge branch 'parity-rng' into parity-develop-edge

Author: ryanmr

source/wargame/Deck.java

@@ -14,8 +14,8 @@ class Deck {
     cards = new ArrayList<Card>();
   }
 
-  public void shuffle() {
-    Collections.shuffle(this.cards);
+  public void shuffle(Random rng) {
+    Collections.shuffle(this.cards, rng);
   }
 
   public int getSize() {

source/wargame/WarGame.java

@@ -1,11 +1,13 @@
 package wargame;
 
+import java.util.*;
+
 class WarGame {
 
-  public void play() {
+  public void play(Random rng) {
 
     Deck deck = Deck.fresh();
-    deck.shuffle();
+    deck.shuffle(rng);
 
     Deck[] player = deck.split();
 
@@ -40,10 +42,10 @@ public void play() {
           player[1].giveCard(winner);
 
           if (c1.compareTo(c2) > 0) {
-            winner.shuffle();
+            winner.shuffle(rng);
             winner.giveCards(player[0]);
           } else if (c1.compareTo(c2) < 0) {
-            winner.shuffle();
+            winner.shuffle(rng);
             winner.giveCards(player[1]);
           } else {
             // another war
@@ -52,10 +54,10 @@ public void play() {
         } while (c1.compareTo(c2) == 0);
 
       } else if (c1.compareTo(c2) > 0) {
-        winner.shuffle();
+        winner.shuffle(rng);
         winner.giveCards(player[0]);
       } else if (c1.compareTo(c2) < 0) {
-        winner.shuffle();
+        winner.shuffle(rng);
         winner.giveCards(player[1]);
       }
 

source/wargame/WarGameThread.java

@@ -1,5 +1,7 @@
 package wargame;
 
+import java.util.*;
+
 class WarGameThread extends Thread {
 
 	public static boolean isAlive(WarGameThread[] threads) {
@@ -55,8 +57,9 @@ public void terminate() {
 
 	public void run() {
 		WarGame game = new WarGame();
+		Random rng = new Random();
 		while ( !this.terminate ) {
-			game.play();
+			game.play(rng);
 			this.processed++;
 		}