Hotfix players tidy-up

- Removing OTLA
- Renaming players consistently
- Sorting out players into packages
- Moving main player classes out of subpackage

Author: rdgain

src/main/java/core/AbstractGUI.java

@@ -2,7 +2,7 @@
 
 import core.actions.AbstractAction;
 import gui.WindowInput;
-import players.ActionController;
+import players.human.ActionController;
 import utilities.Utils;
 
 import javax.swing.*;

src/main/java/core/Game.java

@@ -4,9 +4,12 @@
 import core.interfaces.IPrintable;
 import core.turnorders.ReactiveTurnOrder;
 import games.GameType;
-import players.*;
+import players.human.ActionController;
+import players.human.HumanGUIPlayer;
 import players.mcts.MCTSPlayer;
-import players.rmhc.RMHC;
+import players.rmhc.RMHCPlayer;
+import players.simple.OSLAPlayer;
+import players.simple.RandomPlayer;
 import utilities.Pair;
 import utilities.StatSummary;
 import utilities.Utils;
@@ -643,38 +646,35 @@ public static void recordPlayerResults(StatSummary[] statSummaries, Game game) {
      */
     public static void main(String[] args) {
         /* 1. Action controller for GUI interactions. If set to null, running without visuals. */
-        ActionController ac = new ActionController(); //null;
+        ActionController ac = null;//new ActionController(); //null;
 
         /* 2. Game seed */
         long seed = System.currentTimeMillis(); //0;
 
         /* 3. Set up players for the game */
         ArrayList<AbstractPlayer> players = new ArrayList<>();
-//        players.add(new OSLA());
-//        players.add(new RandomPlayer());
-//        players.add(new RandomPlayer());
-//        players.add(new RandomPlayer());
-//        players.add(new RMHC());
+        players.add(new RandomPlayer());
+        players.add(new RMHCPlayer());
         players.add(new MCTSPlayer());
-//        players.add(new OSLA());
-        players.add(new HumanGUIPlayer(ac));
+        players.add(new OSLAPlayer());
+//        players.add(new HumanGUIPlayer(ac));
 //        players.add(new HumanConsolePlayer());
 
         /* 4. Run! */
 //        runOne(ExplodingKittens, players, seed, ac, false);
 //        runMany(GameType.Category.Strategy.getAllGames(), players, null, 50, null, false);
 
-        ArrayList<GameType> games = new ArrayList<>();
-        games.add(TicTacToe);
+//        ArrayList<GameType> games = new ArrayList<>();
+//        games.add(TicTacToe);
 //        games.add(ExplodingKittens);
 //        games.add(LoveLetter);
 //        runMany(games, players, null, 50, null, false, false);
 
-//        ArrayList<GameType> games = new ArrayList<>(Arrays.asList(GameType.values()));
+        ArrayList<GameType> games = new ArrayList<>(Arrays.asList(GameType.values()));
 //        games.remove(LoveLetter);
-//        games.remove(Pandemic);
+        games.remove(Pandemic);
 //        games.remove(TicTacToe);
-        runMany(games, players, null, 1, ac, false, true);
+        runMany(games, players, null, 100, ac, false, true);
 //        runMany(new ArrayList<GameType>() {{add(Uno);}}, players, null, 1000, null, false, false);
     }
 }

src/main/java/evaluation/AIReport.java

@@ -3,14 +3,14 @@
 import core.AbstractPlayer;
 import core.Game;
 import games.GameType;
-import players.RandomPlayer;
-import players.utils.PlayerType;
+import players.simple.RandomPlayer;
+import players.PlayerType;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import static games.GameType.*;
-import static players.utils.PlayerType.*;
+import static players.PlayerType.*;
 
 public class AIReport {
 

src/main/java/evaluation/GameReport.java

@@ -6,14 +6,13 @@
 import core.Game;
 import evaluation.testplayers.RandomTestPlayer;
 import games.GameType;
-import players.RandomPlayer;
+import players.simple.RandomPlayer;
 import utilities.BoxPlot;
 import utilities.LineChart;
 import utilities.Pair;
 import utilities.StatSummary;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import static games.GameType.*;

src/main/java/evaluation/RoundRobinTournament.java

@@ -2,10 +2,10 @@
 
 import core.AbstractPlayer;
 import games.GameType;
-import players.OSLA;
-import players.RandomPlayer;
+import players.simple.OSLAPlayer;
+import players.simple.RandomPlayer;
 import players.mcts.MCTSPlayer;
-import players.rmhc.RMHC;
+import players.rmhc.RMHCPlayer;
 import utilities.Utils;
 
 import java.util.LinkedList;
@@ -34,8 +34,8 @@ public static void main(String[] args){
         /* 2. Set up players */
         LinkedList<AbstractPlayer> agents = new LinkedList<>();
         agents.add(new RandomPlayer());
-        agents.add(new RMHC());
-        agents.add(new OSLA());
+        agents.add(new RMHCPlayer());
+        agents.add(new OSLAPlayer());
         agents.add(new MCTSPlayer());
 
         // Run!

src/main/java/games/GameType.java

@@ -29,8 +29,8 @@
 import games.virus.VirusGameParameters;
 import games.virus.VirusGameState;
 import gui.PrototypeGUI;
-import players.ActionController;
-import players.HumanGUIPlayer;
+import players.human.ActionController;
+import players.human.HumanGUIPlayer;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/games/coltexpress/ColtExpressGame.java

@@ -5,7 +5,7 @@
 import core.AbstractForwardModel;
 import core.Game;
 import games.GameType;
-import players.RandomPlayer;
+import players.simple.RandomPlayer;
 import utilities.Utils;
 
 import java.util.ArrayList;

src/main/java/games/coltexpress/gui/ColtExpressGUI.java

@@ -7,8 +7,8 @@
 import games.coltexpress.ColtExpressGameState;
 import games.coltexpress.ColtExpressParameters;
 import games.coltexpress.components.Compartment;
-import players.ActionController;
-import players.HumanGUIPlayer;
+import players.human.ActionController;
+import players.human.HumanGUIPlayer;
 
 import javax.swing.*;
 import javax.swing.border.Border;

src/main/java/games/explodingkittens/ExplodingKittensGame.java

@@ -2,7 +2,7 @@
 
 import core.*;
 import games.GameType;
-import players.RandomPlayer;
+import players.simple.RandomPlayer;
 
 import java.util.*;
 

src/main/java/games/explodingkittens/gui/ExplodingKittensGUI.java

@@ -6,8 +6,8 @@
 import core.Game;
 import games.explodingkittens.ExplodingKittensParameters;
 import games.explodingkittens.ExplodingKittensGameState;
-import players.ActionController;
-import players.HumanGUIPlayer;
+import players.human.ActionController;
+import players.human.HumanGUIPlayer;
 
 import javax.swing.*;
 import javax.swing.border.Border;