changed the way multithreading worked

* mcts v1, v2, v3, v4 done. v5 wip

* update mcts

* mcts v1, v2, v3, v4 done. v5 wip

* update mcts

* Merge changes on dev

* update mcts

---------

Co-authored-by: ramollia <>

.idea/inspectionProfiles/Project_Default.xml

@@ -2,7 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,org.toop.framework.audio.AudioPlayer,play,java.util.Map,remove,java.util.concurrent.Executors,newSingleThreadScheduledExecutor" />
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,java.lang.foreign.Arena,ofAuto,java.lang.foreign.Arena,global,org.toop.framework.audio.AudioPlayer,play,java.util.Map,remove,java.util.concurrent.Executors,newSingleThreadScheduledExecutor|newFixedThreadPool|newSingleThreadExecutor" />
     </inspection_tool>
     <inspection_tool class="WriteOnlyObject" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>

app/src/main/java/org/toop/Main.java

@@ -1,53 +1,23 @@
 package org.toop;
 
 import org.toop.app.App;
+import org.toop.framework.game.games.reversi.BitboardReversi;
+import org.toop.framework.game.players.ArtificialPlayer;
+import org.toop.game.players.ai.MCTSAI;
+import org.toop.game.players.ai.RandomAI;
+import org.toop.game.players.ai.mcts.MCTSAI1;
+import org.toop.game.players.ai.mcts.MCTSAI2;
+import org.toop.game.players.ai.mcts.MCTSAI3;
+import org.toop.game.players.ai.mcts.MCTSAI4;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 public final class Main {
     static void main(String[] args) {
 		App.run(args);
-		// testMCTS(10);
+
+		// final ExecutorService executor = Executors.newFixedThreadPool(1);
+		// executor.execute(() -> testAIs(25));
     }
-
-	// Voor onderzoek
-	// private static void testMCTS(int games) {
-	// 	var random = new ArtificialPlayer<>(new RandomAI<BitboardReversi>(), "Random AI");
-	// 	var v1 = new ArtificialPlayer<>(new MCTSAI<BitboardTicTacToe>(10), "MCTS V1 AI");
-	// 	var v2 = new ArtificialPlayer<>(new MCTSAI2<BitboardTicTacToe>(10), "MCTS V2 AI");
-	// 	var v2_2 = new ArtificialPlayer<>(new MCTSAI2<BitboardTicTacToe>(100), "MCTS V2_2 AI");
-	// 	var v3 = new ArtificialPlayer<>(new MCTSAI3<BitboardTicTacToe>(10), "MCTS V3 AI");
-
-	// 	testAI(games, new Player[]{ v1, v2 });
-	// 	// testAI(games, new Player[]{ v1, v3 });
-
-	// 	// testAI(games, new Player[]{ random, v3 });
-	// 	// testAI(games, new Player[]{ v2, v3 });
-	// 	testAI(games, new Player[]{ v2, v3 });
-	// 	// testAI(games, new Player[]{ v3, v2 });
-	// }
-
-	// private static void testAI(int games, Player<BitboardReversi>[] ais) {
-	// 	int wins = 0;
-	// 	int ties = 0;
-
-	// 	for (int i = 0; i < games; i++) {
-	// 		final BitboardReversi match = new BitboardReversi(ais);
-
-	// 		while (!match.isTerminal()) {
-	// 			final int currentAI = match.getCurrentTurn();
-	// 			final long move = ais[currentAI].getMove(match);
-
-	// 			match.play(move);
-	// 		}
-
-	// 		if (match.getWinner() < 0) {
-	// 			ties++;
-	// 			continue;
-	// 		}
-
-	// 		wins += match.getWinner() == 0? 1 : 0;
-	// 	}
-
-	// 	System.out.printf("Out of %d games, %s won %d -- tied %d -- lost %d, games against %s\n", games, ais[0].getName(), wins, ties, games - wins - ties, ais[1].getName());
-	// 	System.out.printf("Average win rate was: %.2f\n\n", wins / (float)games);
-	// }
 }

app/src/main/java/org/toop/app/Server.java

@@ -11,6 +11,7 @@ import org.toop.app.widget.popup.ErrorPopup;
 import org.toop.app.widget.popup.SendChallengePopup;
 import org.toop.app.widget.view.ServerView;
 import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.game.players.ArtificialPlayer;
 import org.toop.framework.game.players.OnlinePlayer;
 import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.eventbus.GlobalEventBus;
@@ -19,9 +20,10 @@ import org.toop.framework.networking.connection.clients.TournamentNetworkingClie
 import org.toop.framework.networking.connection.events.NetworkEvents;
 import org.toop.framework.networking.connection.types.NetworkingConnector;
 import org.toop.framework.networking.server.gateway.NettyGatewayServer;
-import org.toop.framework.game.players.LocalPlayer;
+import org.toop.game.players.ai.mcts.MCTSAI3;
 import org.toop.local.AppContext;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
@@ -117,7 +119,8 @@ public final class Server {
 				return;
 			}
 
-			primary = new ServerView(user, this::sendChallenge, clientId);
+			primary = new ServerView(user, this::sendChallenge, user, clientId);
+
 			WidgetContainer.getCurrentView().transitionNextCustom(primary, "disconnect", this::disconnect);
 
 			a.unsubscribe("connecting");
@@ -159,7 +162,8 @@ public final class Server {
                 .listen(NetworkEvents.GameResultResponse.class, this::handleGameResult, false, "game-result")
                 .listen(NetworkEvents.GameMoveResponse.class, this::handleReceivedMove, false, "game-move")
                 .listen(NetworkEvents.YourTurnResponse.class, this::handleYourTurn, false, "your-turn")
-				.listen(NetworkEvents.ClosedConnection.class, this::closedConnection, false, "closed-connection");
+				.listen(NetworkEvents.ClosedConnection.class, this::closedConnection, false, "closed-connection")
+                .listen(NetworkEvents.TournamentResultResponse.class, this::handleTournamentResult, false, "tournament-result");
 
 		connectFlow = a;
 	}
@@ -205,7 +209,8 @@ public final class Server {
             information.players[opponentStartingTurn].name = response.opponent();
 
             Player[] players = new Player[2];
-            players[userStartingTurn] = new LocalPlayer(user);
+
+            players[userStartingTurn] = new ArtificialPlayer(new MCTSAI3(1000), user);
             players[opponentStartingTurn] = new OnlinePlayer(response.opponent());
 
             switch (type) {
@@ -238,6 +243,13 @@ public final class Server {
         gameController.gameFinished(response);
     }
 
+    private void handleTournamentResult(NetworkEvents.TournamentResultResponse response) {
+        IO.println(response.gameType());
+        IO.println(Arrays.toString(response.names()));
+		IO.println(Arrays.toString(response.scoreTypes()));
+        IO.println(Arrays.toString(response.scores().toArray()));
+    }
+
     private void handleReceivedMove(NetworkEvents.GameMoveResponse response) {
         if (gameController == null) {
             return;
@@ -337,7 +349,8 @@ public final class Server {
 
 	private void gamesListFromServerHandler(NetworkEvents.GamelistResponse event) {
 		gameList.clear();
-		var gl = List.of(event.gamelist());
+		var gl = new java.util.ArrayList<>(List.of(event.gamelist()));
+        gl.sort(String::compareTo);
 		gameList.addAll(gl);
 		primary.updateGameList(gl);
 	}

app/src/main/java/org/toop/app/gameControllers/GenericGameController.java

@@ -10,6 +10,7 @@ import org.toop.app.widget.WidgetContainer;
 import org.toop.app.widget.view.GameView;
 import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.eventbus.GlobalEventBus;
+import org.toop.framework.game.games.reversi.BitboardReversi;
 import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.gameFramework.model.game.threadBehaviour.SupportsOnlinePlay;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
@@ -158,8 +159,14 @@ public class GenericGameController implements GameController {
         canvas.redraw(gameCopy);
         String gameType = game.getClass().getSimpleName().replace("Bitboard","");
         gameView.nextPlayer(true, getCurrentPlayer().getName(), game.getPlayer(1-getCurrentPlayerIndex()).getName(),gameType);
-        if (getCurrentPlayer() instanceof LocalPlayer && gameType.equals("Reversi")){
+        if (gameType.equals("Reversi")) {
-            ((ReversiBitCanvas)canvas).drawLegalDots(gameCopy);
+            BitboardReversi reversiGame = (BitboardReversi) game;
+            BitboardReversi.Score reversiScore = reversiGame.getScore();
+            gameView.setPlayer1Score(reversiScore.black());
+            gameView.setPlayer2Score(reversiScore.white());
+            if (getCurrentPlayer() instanceof LocalPlayer) {
+                ((ReversiBitCanvas)canvas).drawLegalDots(gameCopy);
+            }
         }
     }
 }

app/src/main/java/org/toop/app/gameControllers/ReversiBitController.java

@@ -11,13 +11,19 @@ import org.toop.framework.game.players.OnlinePlayer;
 import java.util.Arrays;
 
 public class ReversiBitController extends GenericGameController {
+
+    private BitboardReversi game;
+
     public ReversiBitController(Player[] players) {
         BitboardReversi game = new BitboardReversi();
         game.init(players);
-
         ThreadBehaviour thread = Arrays.stream(players).anyMatch(e -> e instanceof OnlinePlayer) ?
                 new OnlineThreadBehaviour(game) : new LocalThreadBehaviour(game);
 
         super(new ReversiBitCanvas(), game, thread, "Reversi");
     }
+
+    public BitboardReversi.Score getScore() {
+        return game.getScore();
+    }
 }

app/src/main/java/org/toop/app/widget/popup/GameOverPopup.java

@@ -4,6 +4,7 @@ import org.toop.app.widget.complex.ConfirmWidget;
 import org.toop.app.widget.complex.PopupWidget;
 
 import javafx.geometry.Pos;
+import org.toop.framework.game.games.reversi.BitboardReversi;
 
 public final class GameOverPopup extends PopupWidget {
 	public GameOverPopup(boolean winOrTie, String winner) {
@@ -15,7 +16,6 @@ public final class GameOverPopup extends PopupWidget {
         else{
             confirmWidget.setMessage("It was a tie!");
         }
-
 		confirmWidget.addButton("ok", this::hide);
 
 		add(Pos.CENTER, confirmWidget);

app/src/main/java/org/toop/app/widget/view/GameView.java

@@ -26,6 +26,8 @@ public final class GameView extends ViewWidget {
     private final Text player2Header;
     private Circle player1Icon;
     private Circle player2Icon;
+    private final Text player1Score;
+    private final Text player2Score;
 	private final Button forfeitButton;
 	private final Button exitButton;
     private final TextField chatInput;
@@ -40,6 +42,8 @@ public final class GameView extends ViewWidget {
         player2Header = Primitive.header("");
         player1Icon = new Circle();
         player2Icon = new Circle();
+        player1Score = Primitive.header("");
+        player2Score = Primitive.header("");
 
 		if (onForfeit != null) {
 			forfeitButton = Primitive.button("forfeit", () -> onForfeit.run(), false);
@@ -153,14 +157,16 @@ public final class GameView extends ViewWidget {
     private void setPlayerInfoReversi() {
         var player1box = Primitive.hbox(
                 player1Icon,
-                player1Header
+                player1Header,
+                player1Score
         );
 
         player1box.getStyleClass().add("hboxspacing");
 
         var player2box = Primitive.hbox(
                 player2Icon,
-                player2Header
+                player2Header,
+                player2Score
         );
 
         player2box.getStyleClass().add("hboxspacing");
@@ -178,4 +184,12 @@ public final class GameView extends ViewWidget {
         player2Icon.setFill(Color.BLACK);
         add(Pos.TOP_RIGHT, playerInfo);
     }
+
+    public void setPlayer1Score(int score) {
+        player1Score.setText("(" + Integer.toString(score) + ")");
+    }
+
+    public void setPlayer2Score(int score) {
+        player2Score.setText("(" + Integer.toString(score) + ")");
+    }
 }

app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java

@@ -4,6 +4,7 @@ import javafx.application.Platform;
 import org.toop.app.GameInformation;
 import org.toop.app.gameControllers.ReversiBitController;
 import org.toop.app.gameControllers.TicTacToeBitController;
+import org.toop.framework.game.players.LocalPlayer;
 import org.toop.framework.gameFramework.controller.GameController;
 import org.toop.framework.gameFramework.model.player.Player;
 import org.toop.framework.game.players.ArtificialPlayer;
@@ -12,11 +13,10 @@ import org.toop.app.widget.complex.PlayerInfoWidget;
 import org.toop.app.widget.complex.ViewWidget;
 import org.toop.app.widget.popup.ErrorPopup;
 import org.toop.app.widget.tutorial.*;
-import org.toop.framework.game.players.LocalPlayer;
-import org.toop.game.players.ai.MCTSAI;
-import org.toop.game.players.ai.MCTSAI2;
-import org.toop.game.players.ai.MCTSAI3;
 import org.toop.game.players.ai.MiniMaxAI;
+import org.toop.game.players.ai.mcts.MCTSAI1;
+import org.toop.game.players.ai.mcts.MCTSAI3;
+import org.toop.game.players.ai.mcts.MCTSAI4;
 import org.toop.local.AppContext;
 
 import javafx.geometry.Pos;
@@ -54,7 +54,7 @@ public class LocalMultiplayerView extends ViewWidget {
                     if (information.players[0].isHuman) {
                         players[0] = new LocalPlayer(information.players[0].name);
                     } else {
-                        players[0] = new ArtificialPlayer(new MCTSAI(100), "MCTS AI");
+                        players[0] = new ArtificialPlayer(new MCTSAI1(100), "MCTS AI");
                     }
                     if (information.players[1].isHuman) {
                         players[1] = new LocalPlayer(information.players[1].name);
@@ -82,13 +82,13 @@ public class LocalMultiplayerView extends ViewWidget {
                     if (information.players[0].isHuman) {
                         players[0] = new LocalPlayer(information.players[0].name);
                     } else {
-						// players[0] = new ArtificialPlayer(new RandomAI<BitboardReversi>(), "Random AI");
+						// players[0] = new ArtificialPlayer(new RandomAI(), "Random AI");
-						players[0] = new ArtificialPlayer(new MCTSAI3(50), "MCTS V3 AI");
+						players[0] = new ArtificialPlayer(new MCTSAI1(100), "MCTS V1 AI");
                     }
                     if (information.players[1].isHuman) {
                         players[1] = new LocalPlayer(information.players[1].name);
                     } else {
-						players[1] = new ArtificialPlayer(new MCTSAI(50), "MCTS V1 AI");
+						players[1] = new ArtificialPlayer(new MCTSAI4(100), "MCTS V4 AI");
                     }
                     if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstReversi()) {
                         new ShowEnableTutorialWidget(

app/src/main/java/org/toop/app/widget/view/ServerView.java

@@ -6,6 +6,8 @@ import javafx.scene.control.ComboBox;
 import org.toop.app.widget.Primitive;
 import org.toop.app.widget.complex.ViewWidget;
 
+import java.io.Reader;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.function.Consumer;
@@ -15,6 +17,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.ListView;
 import org.toop.framework.eventbus.EventFlow;
+import org.toop.framework.eventbus.GlobalEventBus;
 import org.toop.framework.networking.connection.events.NetworkEvents;
 
 public final class ServerView extends ViewWidget {
@@ -22,46 +25,65 @@ public final class ServerView extends ViewWidget {
 	private final Consumer<String> onPlayerClicked;
 	private final long clientId;
 
-	private final ComboBox<String> gameList;
+	private final ComboBox<String> gameListSub;
+    private final ComboBox<String> gameListTour;
 	private final ListView<Button> listView;
 	private Button subscribeButton;
 
-	public ServerView(String user, Consumer<String> onPlayerClicked, long clientId) {
+	public ServerView(String user, Consumer<String> onPlayerClicked, String userName, long clientId) {
 		this.user = user;
 		this.onPlayerClicked = onPlayerClicked;
 		this.clientId = clientId;
 
-		this.gameList = new ComboBox<>();
+		this.gameListSub = new ComboBox<>();
+        this.gameListTour = new ComboBox<>();
 		this.listView = new ListView<>();
 
-		setupLayout();
+		setupLayout(userName);
 	}
 
-	private void setupLayout() {
+	private void setupLayout(String userName) {
 		var playerHeader = Primitive.header(user, false);
 
-		subscribeButton = Primitive.button(
+        if (userName.equals("host")) { // TODO is fragile
-				"subscribe",
+            var tournamentButton = Primitive.hbox(
-				() -> new EventFlow().addPostEvent(new NetworkEvents.SendSubscribe(clientId, gameList.getValue())).postEvent(),
+                    gameListTour,
-				false,
+                    Primitive.button(
-				true
+                            "tournament",
-		); // TODO localize
+                            () -> GlobalEventBus.get().post(new NetworkEvents.SendCommand(clientId, "tournament", "start", gameListTour.getValue())),
+                            false,
+                            false
+                    )
+            );
 
-		var subscribe = Primitive.hbox(gameList, subscribeButton);
+            add(Pos.BOTTOM_CENTER, tournamentButton);
+        } else {
+            subscribeButton = Primitive.button(
+                    "subscribe",
+                    () -> new EventFlow().addPostEvent(new NetworkEvents.SendSubscribe(clientId, gameListSub.getValue())).postEvent(),
+                    false,
+                    true
+            ); // TODO localize
 
-		var playerListSection = Primitive.vbox(
+            var subscribe = Primitive.hbox(gameListSub, subscribeButton);
-			playerHeader,
-			Primitive.separator(),
-			subscribe,
-			listView
-		);
 
-		add(Pos.CENTER, playerListSection);
+            var playerListSection = Primitive.vbox(
+                    playerHeader,
+                    Primitive.separator(),
+                    subscribe,
+                    listView
+            );
 
-		var disconnectButton = Primitive.button(
+            add(Pos.CENTER, playerListSection);
-				"disconnect", () -> transitionPrevious(), false);
 
-		add(Pos.BOTTOM_LEFT, Primitive.vbox(disconnectButton));
+            var disconnectButton = Primitive.button(
+                    "disconnect",
+					this::transitionPrevious,
+					false
+			);
+
+            add(Pos.BOTTOM_LEFT, Primitive.vbox(disconnectButton));
+        }
 	}
 
 	public void update(List<String> players) {
@@ -77,9 +99,13 @@ public final class ServerView extends ViewWidget {
 
 	public void updateGameList(List<String> games) {
 		Platform.runLater(() -> {
-			gameList.getItems().clear();
+			gameListSub.getItems().clear();
-			gameList.setItems(FXCollections.observableArrayList(games));
+			gameListSub.setItems(FXCollections.observableArrayList(games));
-			gameList.getSelectionModel().select(0);
+			gameListSub.getSelectionModel().select(0);
+
+            gameListTour.getItems().clear();
+            gameListTour.setItems(FXCollections.observableArrayList(games));
+            gameListTour.getSelectionModel().select(0);
 		});
 	}
 

framework/src/main/java/org/toop/framework/eventbus/EventFlow.java

@@ -415,11 +415,9 @@ public class EventFlow {
     /**
      * Posts the event added through {@link #addPostEvent} asynchronously.
      *
-     * @deprecated use {@link #postEvent()} instead.
      */
-    @Deprecated
     public EventFlow asyncPostEvent() {
-        eventBus.post(this.event);
+        GlobalEventBus.get().post(this.event);
         return this;
     }
 

framework/src/main/java/org/toop/framework/eventbus/GlobalEventBus.java

@@ -1,15 +1,20 @@
 package org.toop.framework.eventbus;
 
 import org.apache.logging.log4j.LogManager;
+import org.toop.framework.eventbus.bus.AsyncEventBus;
+import org.toop.framework.eventbus.bus.DefaultEventBus;
 import org.toop.framework.eventbus.bus.DisruptorEventBus;
 import org.toop.framework.eventbus.bus.EventBus;
 import org.toop.framework.eventbus.events.EventType;
 import org.toop.framework.eventbus.store.DefaultSubscriberStore;
 import org.toop.framework.eventbus.subscriber.Subscriber;
 
-public class GlobalEventBus implements EventBus {
+import java.util.concurrent.ExecutorService;
-    private static final EventBus INSTANCE = new DisruptorEventBus(
+import java.util.concurrent.Executors;
-            LogManager.getLogger(DisruptorEventBus.class),
+
+public class GlobalEventBus implements AsyncEventBus {
+    private static final AsyncEventBus INSTANCE = new DefaultEventBus(
+            LogManager.getLogger(DefaultEventBus.class),
             new DefaultSubscriberStore()
     );
 
@@ -34,6 +39,11 @@ public class GlobalEventBus implements EventBus {
         INSTANCE.post(event);
     }
 
+    @Override
+    public <T extends EventType> void asyncPost(T event) {
+        INSTANCE.asyncPost(event);
+    }
+
     @Override
     public void shutdown() {
         INSTANCE.shutdown();
@@ -43,4 +53,5 @@ public class GlobalEventBus implements EventBus {
     public void reset() {
         INSTANCE.reset();
     }
+
 }

framework/src/main/java/org/toop/framework/eventbus/bus/AsyncEventBus.java

@@ -0,0 +1,7 @@
+package org.toop.framework.eventbus.bus;
+
+import org.toop.framework.eventbus.events.EventType;
+
+public interface AsyncEventBus extends EventBus {
+    <T extends EventType> void asyncPost(T event);
+}

framework/src/main/java/org/toop/framework/eventbus/bus/DefaultEventBus.java

@@ -5,12 +5,16 @@ import org.toop.framework.eventbus.events.EventType;
 import org.toop.framework.eventbus.store.SubscriberStore;
 import org.toop.framework.eventbus.subscriber.Subscriber;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.function.Consumer;
 
-public class DefaultEventBus implements EventBus {
+public class DefaultEventBus implements AsyncEventBus {
     private final Logger logger;
     private final SubscriberStore eventsHolder;
 
+    private final ExecutorService asyncExecutor = Executors.newCachedThreadPool();
+
     public DefaultEventBus(Logger logger, SubscriberStore eventsHolder) {
         this.logger = logger;
         this.eventsHolder = eventsHolder;
@@ -36,11 +40,16 @@ public class DefaultEventBus implements EventBus {
                 Class<T> eventClass = (Class<T>) subscriber.event();
                 Consumer<EventType> action = (Consumer<EventType>) subscriber.handler();
 
-                action.accept((EventType) eventClass.cast(event));
+                action.accept(eventClass.cast(event));
             }
         }
     }
 
+    @Override
+    public <T extends EventType> void asyncPost(T event) {
+        asyncExecutor.submit(() -> post(event));
+    }
+
     @Override
     public void shutdown() {
         eventsHolder.reset();
@@ -50,4 +59,5 @@ public class DefaultEventBus implements EventBus {
     public void reset() {
         eventsHolder.reset();
     }
+
 }

framework/src/main/java/org/toop/framework/game/BitboardGame.java

@@ -17,8 +17,8 @@ public abstract class BitboardGame implements TurnBasedGame {
     private Player[] players;
 
 	// long is 64 bits. Every game has a limit of 64 cells maximum.
-	private final long[] playerBitboard;
+	protected final long[] playerBitboard;
-	private int currentTurn = 0;
+	protected int currentTurn = 0;
 	private final int playerCount;
 
 	public BitboardGame(int columnSize, int rowSize, int playerCount) {
@@ -74,6 +74,8 @@ public abstract class BitboardGame implements TurnBasedGame {
 		return playerBitboard.length;
 	}
 
+    public int getAmountOfTurns() { return currentTurn; }
+
 	public int getCurrentTurn() {
 		return getCurrentPlayerIndex();
 	}

framework/src/main/java/org/toop/framework/game/gameThreads/OnlineThreadBehaviour.java

@@ -77,13 +77,11 @@ public class OnlineThreadBehaviour extends AbstractThreadBehaviour implements Su
         }
         logger.info("Successfully collected current turn's player");
 
-        moveExecutor.submit(() -> {
+        long move = player.getMove(gameCopy);
-            long move = player.getMove(gameCopy);
+        logger.info("Move set: {}", move);
-            logger.info("Move set: {}", move);
+        logger.info("Completed onYourTurn");
-            logger.info("Completed onYourTurn");
 
-            sendMove(clientId, move);
+        sendMove(clientId, move);
-        });
     }
 
     /**

framework/src/main/java/org/toop/framework/game/gameThreads/ServerThreadBehaviour.java

@@ -1,31 +1,39 @@
 package org.toop.framework.game.gameThreads;
 
-import org.toop.framework.eventbus.EventFlow;
 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.game.threadBehaviour.AbstractThreadBehaviour;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.gameFramework.view.GUIEvents;
 import org.toop.framework.utils.ImmutablePair;
 import org.toop.framework.utils.Pair;
 
+import java.time.Duration;
+import java.util.concurrent.*;
 import java.util.function.Consumer;
 
-import static org.toop.framework.gameFramework.GameState.TURN_SKIPPED;
-import static org.toop.framework.gameFramework.GameState.WIN;
-
 public class ServerThreadBehaviour extends AbstractThreadBehaviour implements Runnable {
     private final Consumer<ImmutablePair<String, Integer>> onPlayerMove;
     private final Consumer<Pair<GameState, Integer>> onGameEnd;
+
+    private final ExecutorService moveExecutor = Executors.newSingleThreadExecutor();
+
+    private final Duration timeOut;
     /**
      * Creates a new base behaviour for the specified game.
      *
      * @param game the turn-based game to control
      */
-    public ServerThreadBehaviour(TurnBasedGame game, Consumer<ImmutablePair<String, Integer>> onPlayerMove, Consumer<Pair<GameState, Integer>> onGameEnd) {
+    public ServerThreadBehaviour(
+            TurnBasedGame game,
+            Consumer<ImmutablePair<String,
+                    Integer>> onPlayerMove,
+            Consumer<Pair<GameState, Integer>> onGameEnd,
+            Duration timeOut
+    ) {
         this.onPlayerMove = onPlayerMove;
         this.onGameEnd = onGameEnd;
+        this.timeOut = timeOut;
         super(game);
     }
 
@@ -59,23 +67,42 @@ public class ServerThreadBehaviour extends AbstractThreadBehaviour implements Ru
     public void run() {
         while (isRunning.get()) {
             Player currentPlayer = game.getPlayer(game.getCurrentTurn());
-            long move = currentPlayer.getMove(game.deepCopy());
-            PlayResult result = game.play(move);
 
-            GameState state = result.state();
+            Future<Long> move = moveExecutor.submit(() -> currentPlayer.getMove(game.deepCopy()));
-            notifyPlayerMove(new ImmutablePair<>(currentPlayer.getName(), Long.numberOfTrailingZeros(move)));
 
-            switch (state) {
+            PlayResult result;
-                case WIN, DRAW -> {
+            try {
-                    isRunning.set(false);
+                long moveResult = move.get(timeOut.toMillis(), TimeUnit.MILLISECONDS);
-                    notifyGameEnd(new ImmutablePair<>(state, game.getWinner()));
+                result = game.play(moveResult);
-                }
+
-                case NORMAL, TURN_SKIPPED -> { /* continue normally */ }
+                GameState state = result.state();
-                default -> {
+                notifyPlayerMove(new ImmutablePair<>(currentPlayer.getName(), Long.numberOfTrailingZeros(moveResult)));
-                    logger.error("Unexpected state {}", state);
+
-                    isRunning.set(false);
+                switch (state) {
-                    throw new RuntimeException("Unknown state: " + state);
+                    case WIN, DRAW -> {
+                        isRunning.set(false);
+                        moveExecutor.shutdown();
+                        notifyGameEnd(new ImmutablePair<>(state, game.getWinner()));
+                    }
+                    case NORMAL, TURN_SKIPPED -> { /* continue normally */ }
+                    default -> {
+                        logger.error("Unexpected state {}", state);
+                        isRunning.set(false);
+                        moveExecutor.shutdown();
+                        throw new RuntimeException("Unknown state: " + state);
+                    }
                 }
+
+            } catch (InterruptedException | ExecutionException e) {
+                isRunning.set(false);
+                notifyGameEnd(new ImmutablePair<>(GameState.DRAW, 0));
+                moveExecutor.shutdown();
+                return;
+            } catch (TimeoutException e) {
+                isRunning.set(false);
+                notifyGameEnd(new ImmutablePair<>(GameState.WIN, 1+game.getWinner()%2));
+                moveExecutor.shutdown();
+                return;
             }
         }
     }

framework/src/main/java/org/toop/framework/game/games/reversi/BitboardReversi.java

@@ -4,7 +4,6 @@ import org.toop.framework.game.BitboardGame;
 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
 import org.toop.framework.gameFramework.model.player.Player;
-import org.toop.framework.game.BitboardGame;
 
 public class BitboardReversi extends BitboardGame {
 
@@ -321,8 +320,58 @@ public class BitboardReversi extends BitboardGame {
         else if (blackCount > whiteCount){
             return 0;
         }
-        else{
+        else {
             return 1;
         }
     }
+
+	@Override
+	public float rateMove(long move) {
+		final long corners = 0x8100000000000081L;
+
+		if ((move & corners) != 0L) {
+			return 0.4f;
+		}
+
+		final long xSquares = 0x0042000000004200L;
+
+		if ((move & xSquares) != 0) {
+			return -0.4f;
+		}
+
+		final long cSquares = 0x4281000000008142L;
+
+		if ((move & cSquares) != 0) {
+			return -0.1f;
+		}
+
+		return 0.0f;
+	}
+
+	@Override
+	public long heuristicMove(long legalMoves) {
+		long bestMove = 0L;
+		float bestMoveRate = Float.NEGATIVE_INFINITY;
+
+		while (legalMoves != 0L) {
+			final long move = legalMoves & -legalMoves;
+			final float moveRate = rateMove(move);
+
+			if (moveRate > bestMoveRate) {
+				bestMove = move;
+				bestMoveRate = moveRate;
+			}
+
+			legalMoves &= ~move;
+		}
+
+		return bestMove;
+	}
+
+	@Override
+	public void setFrom(long player1, long player2, int turn) {
+		this.playerBitboard[0] = player1;
+		this.playerBitboard[1] = player2;
+		this.currentTurn = turn;
+	}
 }

framework/src/main/java/org/toop/framework/game/games/tictactoe/BitboardTicTacToe.java

@@ -2,6 +2,7 @@ package org.toop.framework.game.games.tictactoe;
 
 import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.PlayResult;
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.player.Player;
 import org.toop.framework.game.BitboardGame;
 
@@ -110,4 +111,18 @@ public class BitboardTicTacToe extends BitboardGame {
     public BitboardTicTacToe deepCopy() {
         return new BitboardTicTacToe(this);
     }
+
+	@Override
+	public float rateMove(long move) {
+		return 0.0f;
+	}
+
+	@Override
+	public long heuristicMove(long legalMoves) {
+		return legalMoves;
+	}
+
+	@Override
+	public void setFrom(long player1, long player2, int turn) {
+	}
 }

framework/src/main/java/org/toop/framework/game/players/ArtificialPlayer.java

@@ -14,7 +14,9 @@ import org.toop.framework.gameFramework.model.game.TurnBasedGame;
  */
 public class ArtificialPlayer extends AbstractPlayer {
 
-    /** The AI instance used to calculate moves. */
+    /**
+     * The AI instance used to calculate moves.
+     */
     private final AI ai;
 
     /**
@@ -57,4 +59,8 @@ public class ArtificialPlayer extends AbstractPlayer {
     public ArtificialPlayer deepCopy() {
         return new ArtificialPlayer(this);
     }
+
+    public AI getAi() {
+        return ai;
+    }
 }

framework/src/main/java/org/toop/framework/game/players/ServerPlayer.java

@@ -29,13 +29,8 @@ public class ServerPlayer extends AbstractPlayer {
     @Override
     public long determineMove(TurnBasedGame game) {
         lastMove = new CompletableFuture<>();
-        System.out.println("Sending yourturn");
+
-        client.send("SVR GAME YOURTURN {TURNMESSAGE: \"<bericht voor deze beurt>\"}\n");
+        client.send("SVR GAME YOURTURN {TURNMESSAGE: \"<bericht voor deze beurt>\"}");
-        try {
+        return lastMove.join();
-            return lastMove.get();
-        } catch (InterruptedException | ExecutionException e) {
-            e.printStackTrace();
-            return 0;
-        }
     }
 }

framework/src/main/java/org/toop/framework/gameFramework/model/game/TurnBasedGame.java

@@ -13,4 +13,9 @@ public interface TurnBasedGame extends DeepCopyable<TurnBasedGame> {
     PlayResult play(long move);
 	PlayResult getState();
 	boolean isTerminal();
+
+	float rateMove(long move);
+	long heuristicMove(long legalMoves);
+
+	void setFrom(long player1, long player2, int turn);
 }

framework/src/main/java/org/toop/framework/networking/connection/events/NetworkEvents.java

@@ -65,6 +65,9 @@ public class NetworkEvents extends EventsBase {
     public record GameResultResponse(long clientId, String condition)
             implements GenericEvent {}
 
+    public record TournamentResultResponse(long clientId, String gameType, String[] names, String[] scoreTypes, List<Integer[]> scores)
+            implements GenericEvent {}
+
     /** Indicates that a game move has been processed or received. */
     public record GameMoveResponse(long clientId, String player, String move, String details)
             implements GenericEvent {}
@@ -219,4 +222,5 @@ public class NetworkEvents extends EventsBase {
     /** Response to a {@link ChangeAddress} event, carrying the success result. */
     public record ChangeAddressResponse(boolean successful, long identifier)
             implements ResponseToUniqueEvent {}
+
 }

framework/src/main/java/org/toop/framework/networking/connection/handlers/NetworkingGameClientHandler.java

@@ -3,6 +3,9 @@ package org.toop.framework.networking.connection.handlers;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelInboundHandlerAdapter;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.regex.MatchResult;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -94,6 +97,9 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
                     case "HELP":
                         helpHandler(recSrvRemoved);
                         return;
+                    case "RESULTS":
+                        resultsHandler(recSrvRemoved);
+                        return;
                     default:
                         // return
                 }
@@ -103,6 +109,66 @@ public class NetworkingGameClientHandler extends ChannelInboundHandlerAdapter {
         }
     }
 
+    private static String extract(String input, String key) {
+        Pattern p = Pattern.compile(
+                key + "\\s*:\\s*(\\[[^]]*]|\"[^\"]*\")",
+                Pattern.CASE_INSENSITIVE
+        );
+        Matcher m = p.matcher(input);
+        return m.find() ? m.group(1) : null;
+    }
+
+    private void resultsHandler(String rec) {
+        // TODO all of this
+
+        IO.println(rec);
+
+        String gameTypeRaw = extract(rec, "GAMETYPE");
+        String usersRaw = extract(rec, "USERS");
+        String scoreTypesRaw = extract(rec, "SCORETYPES");
+        String scoresRaw = extract(rec, "SCORES");
+
+        if (usersRaw == null) return;
+
+        String[] users;
+        if (usersRaw.length() > 2) {
+            users = Arrays.stream(usersRaw.substring(1, usersRaw.length() - 1).split(","))
+                .map(s -> s.trim().replace("\"", ""))
+                .toArray(String[]::new);
+        } else {
+            users = new String[]{};
+        }
+
+        String[] scoreTypes;
+        if (scoreTypesRaw.length() > 2) {
+            scoreTypes = Arrays.stream(scoreTypesRaw.substring(1, usersRaw.length() - 1).split(","))
+                    .map(s -> s.trim().replace("\"", ""))
+                    .toArray(String[]::new);
+        } else {
+            scoreTypes = new String[]{};
+        }
+
+        if (scoresRaw == null) return;
+        if (scoresRaw.length() > 2) {
+            List<Integer[]> scores = Arrays.stream(
+                            scoresRaw.substring(1, scoresRaw.length() - 1) // remove outer []
+                                    .split("\\],\\[")
+                    )
+                    .map(part -> part.replace("[", "").replace("]", ""))
+                    .map(part -> Arrays.stream(part.split(","))
+                            .map(String::trim)
+                            .map(Integer::parseInt)
+                            .toArray(Integer[]::new)
+                    )
+                    .toList();
+
+            eventBus.post(new NetworkEvents.TournamentResultResponse(this.connectionId, gameTypeRaw, users, scoreTypes, scores));
+        } else {
+            eventBus.post(new NetworkEvents.TournamentResultResponse(this.connectionId, gameTypeRaw, users, scoreTypes, new ArrayList<>()));
+        }
+
+    }
+
     private void gameMoveHandler(String rec) {
         String[] msg =
                 Pattern.compile(

framework/src/main/java/org/toop/framework/networking/server/GameResultFuture.java

@@ -0,0 +1,7 @@
+package org.toop.framework.networking.server;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+
+import java.util.concurrent.CompletableFuture;
+
+public record GameResultFuture(OnlineGame<TurnBasedGame> game, CompletableFuture<Integer> result) {}

framework/src/main/java/org/toop/framework/networking/server/GameServer.java

@@ -1,9 +1,13 @@
 package org.toop.framework.networking.server;
 
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+
+import java.time.Duration;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
 public interface GameServer<GAMETYPE, CLIENT, CHALLENGEIDTYPE> {
-    void startGame(String gameType, CLIENT... clients);
+    GameResultFuture startGame(String gameType, Duration turnTime, CLIENT... clients);
 
     void addClient(CLIENT client);
     void removeClient(CLIENT client);

framework/src/main/java/org/toop/framework/networking/server/MatchExecutor.java

@@ -0,0 +1,10 @@
+package org.toop.framework.networking.server;
+
+import org.toop.framework.networking.server.client.NettyClient;
+
+import java.time.Duration;
+
+@FunctionalInterface
+public interface MatchExecutor {
+    GameResultFuture submit(String gameType, Duration turnTime, NettyClient... clients);
+}

framework/src/main/java/org/toop/framework/networking/server/OnlineTurnBasedGame.java

@@ -5,44 +5,65 @@ import org.toop.framework.gameFramework.GameState;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.networking.server.client.NettyClient;
 
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.concurrent.CompletableFuture;
+
 public class OnlineTurnBasedGame implements OnlineGame<TurnBasedGame> {
 
     private long id;
     private NettyClient[] clients;
+    private NettyClient[] admins;
     private TurnBasedGame game;
     private ServerThreadBehaviour gameThread;
 
-    public OnlineTurnBasedGame(TurnBasedGame game, NettyClient... clients) {
+    private final CompletableFuture<Integer> resultFuture;
+
+    public OnlineTurnBasedGame(NettyClient[] admins, TurnBasedGame game, CompletableFuture<Integer> resultFuture, Duration timeOut, NettyClient... clients) {
         this.game = game;
         this.gameThread = new ServerThreadBehaviour(
                 game,
                 (pair) -> notifyMoveMade(pair.getLeft(), pair.getRight()),
-                (pair) -> notifyGameEnd(pair.getLeft(), pair.getRight())
+                (pair) -> notifyGameEnd(pair.getLeft(), pair.getRight()),
+                timeOut
         );
+        this.resultFuture = resultFuture;
         this.clients = clients;
+        this.admins = admins;
     }
 
     private void notifyMoveMade(String speler, int move){
+        for (NettyClient admin : admins) {
+            admin.send(String.format("SVR GAME MOVE {PLAYER: \"%s\", MOVE: \"%s\", DETAILS: \"<reactie spel op zet>\"}", speler, move));
+        }
         for (NettyClient client : clients) {
-            client.send(String.format("SVR GAME MOVE {PLAYER: \"%s\", MOVE: \"%s\", DETAILS: \"<reactie spel op zet>\"}\n", speler, move));
+            client.send(String.format("SVR GAME MOVE {PLAYER: \"%s\", MOVE: \"%s\", DETAILS: \"<reactie spel op zet>\"}", speler, move));
         }
     }
 
-    private void notifyGameEnd(GameState state, int winner){
+    private void notifyGameEnd(GameState state, int winner) {
-        if (state == GameState.DRAW){
+        if (state == GameState.DRAW) {
+            Arrays.stream(admins).forEach(a -> a.send("SVR GAME END"));
+
             for (NettyClient client : clients) {
-                client.send(String.format("SVR GAME DRAW {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}\n"));
+                client.send("SVR GAME DRAW {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}");
             }
-        }
+        } else {
-        else{
+            Arrays.stream(admins).forEach(a -> a.send("SVR GAME END"));
-            clients[winner].send(String.format("SVR GAME WIN {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}\n"));
+            clients[winner].send("SVR GAME WIN {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}");
-            clients[(winner + 1)%2].send(String.format("SVR GAME LOSS {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}\n"));
+            clients[(winner+1)%2].send("SVR GAME LOSS {PLAYERONESCORE: \"<score speler1>\", PLAYERTWOSCORE: \"<score speler2>\", COMMENT: \"<comment>\"}");
         }
 
-        // Remove game fromt clients
+        // Remove game from clients
-        for(NettyClient client : clients) {
+        for (NettyClient client : clients) {
+            admins = null;
             client.clearGame();
         }
+
+        if (resultFuture != null) {
+            if (state.equals(GameState.DRAW)) resultFuture.complete(-1); // Return -1 if draw
+            else resultFuture.complete(winner); // Return number for winner's index
+        }
     }
 
     @Override
@@ -61,7 +82,7 @@ public class OnlineTurnBasedGame implements OnlineGame<TurnBasedGame> {
     }
 
     @Override
-    public void start(){
+    public void start() {
         this.gameThread.start();
     }
 }

framework/src/main/java/org/toop/framework/networking/server/Server.java

@@ -1,5 +1,6 @@
 package org.toop.framework.networking.server;
 
+import com.google.gson.Gson;
 import org.toop.framework.game.players.ServerPlayer;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.networking.server.challenges.gamechallenge.GameChallenge;
@@ -9,6 +10,9 @@ import org.toop.framework.networking.server.stores.ClientStore;
 import org.toop.framework.networking.server.stores.SubscriptionStore;
 import org.toop.framework.networking.server.stores.TurnBasedGameStore;
 import org.toop.framework.networking.server.stores.TurnBasedGameTypeStore;
+import org.toop.framework.networking.server.tournaments.*;
+import org.toop.framework.networking.server.tournaments.matchmakers.DoubleRoundRobinMatchMaker;
+import org.toop.framework.networking.server.tournaments.scoresystems.*;
 import org.toop.framework.utils.ImmutablePair;
 
 import java.util.*;
@@ -27,13 +31,14 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
     final private Duration challengeDuration;
     final private ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor();
 
+    private final List<NettyClient> admins = new ArrayList<>();
+
     public Server(
             Duration challengeDuration,
             TurnBasedGameTypeStore turnBasedGameTypeStore,
             ClientStore<Long, NettyClient> clientStore,
             TurnBasedGameStore gameStore,
             SubscriptionStore subStore
-
     ) {
         this.gameTypesStore = turnBasedGameTypeStore;
         this.challengeDuration = challengeDuration;
@@ -46,11 +51,13 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
 
     @Override
     public void addClient(NettyClient client) {
+        if (admins.isEmpty()) admins.addLast(client);
         clientStore.add(client);
     }
 
     @Override
     public void removeClient(NettyClient client) {
+        admins.remove(client);
         clientStore.remove(client.id());
     }
 
@@ -103,7 +110,7 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
     public void acceptChallenge(Long challengeId) {
         for (var challenge : gameChallenges) {
             if (challenge.id() == challengeId) {
-                startGame(challenge.acceptChallenge(), challenge.getUsers());
+                startGame(challenge.acceptChallenge(), Duration.ofSeconds(10), challenge.getUsers());
                 break;
             }
         }
@@ -125,12 +132,24 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
     }
 
     @Override
-    public void startGame(String gameType, NettyClient... clients) {
+    public GameResultFuture startGame(String gameType, Duration turnTime, NettyClient... clients) {
-        if (!gameTypesStore.all().containsKey(gameType)) return;
+        if (!gameTypesStore.all().containsKey(gameType)) return null;
 
         try {
+
             ServerPlayer[] players = new ServerPlayer[clients.length];
-            var game = new OnlineTurnBasedGame(gameTypesStore.create(gameType), clients);
+
+            var gameResult = new CompletableFuture<Integer>();
+
+            var game = new OnlineTurnBasedGame(
+                    getAdmins().toArray(NettyClient[]::new),
+                    gameTypesStore.create(gameType),
+                    gameResult,
+                    turnTime,
+                    clients
+            );
+
+            var grfReturn = new GameResultFuture(game, gameResult);
 
             for (int i = 0; i < clients.length; i++) {
                 players[i] = new ServerPlayer(clients[i]);
@@ -148,11 +167,14 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
                     clients[0].name(),
                     gameType,
                     clients[0].name()));
+
             game.start();
+            return grfReturn;
         } catch (Exception e) {
             IO.println("ERROR: Failed to start OnlineTurnBasedGame");
             e.printStackTrace();
         }
+        return null;
     }
 
     @Override
@@ -160,6 +182,10 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
         return clientStore.all().stream().toList();
     }
 
+    public List<NettyClient> getAdmins() {
+        return new ArrayList<>(admins); // Clone so the list can't be edited.
+    }
+
     @Override
     public void shutdown() {
         scheduler.shutdown();
@@ -218,7 +244,6 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
                 }
 
                 if  (userInGame) { continue; }
-                //
 
                 int first = Math.max(left, right);
                 int second = Math.min(left, right);
@@ -226,7 +251,7 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
                 userNames.remove(first);
                 userNames.remove(second);
 
-                startGame(key, getUser(userLeft), getUser(userRight));
+                startGame(key, Duration.ofSeconds(10), getUser(userLeft), getUser(userRight));
             }
         }
     }
@@ -260,4 +285,74 @@ public class Server implements GameServer<TurnBasedGame, NettyClient, Long> {
 
         return true;
     }
+
+    public void startTournament(String gameType, NettyClient requestor, boolean shuffle) {
+        if (!admins.contains(requestor)) {
+            requestor.send("ERR you do not have the privileges to start a tournament");
+            return;
+        }
+
+        var tournamentUsers = new ArrayList<>(onlineUsers());
+        tournamentUsers.removeIf(admins::contains);
+
+        Tournament tournament = new Tournament.Builder()
+                .matchExecutor(this::startGame)
+                .tournamentRunner(new AsyncTournamentRunner())
+                .matchMaker(new DoubleRoundRobinMatchMaker())
+                .addScoreSystem(new MatchCountScoreSystem())
+                .addScoreSystem(new WinCountScoreSystem())
+                .addScoreSystem(new DrawCountScoreSystem())
+                .addScoreSystem(new LoseCountScoreSystem())
+                .resultBroadcaster(this::endTournament)
+                .turnTimeout(Duration.ofSeconds(10))
+                .addPlayers(tournamentUsers.toArray(NettyClient[]::new))
+                .addAdmins(admins.toArray(NettyClient[]::new))
+                .build();
+
+        new Thread(() -> tournament.run(gameType)).start();
+    }
+
+    public void endTournament(List<IntegerScoreSystem> systems) {
+        if (systems.isEmpty()) return;
+
+        Map<String, List<ImmutablePair<String, Integer>>> combined = new HashMap<>();
+
+        for (var system : systems) {
+            for (var player : system.getScore().keySet()) {
+                combined.putIfAbsent(player.name(), new ArrayList<>());
+                combined.get(player.name()).addLast(new ImmutablePair<>(system.scoreName(), system.getScore().get(player)));
+            }
+        }
+
+        List<String> names = new ArrayList<>();
+        List<String> systemNames = new ArrayList<>();
+        List<List<Integer>> scores = new ArrayList<>();
+
+        for (var player : combined.entrySet()) {
+            names.addLast(player.getKey());
+            scores.addLast(new ArrayList<>());
+            for (var system : player.getValue()) {
+                if (!systemNames.contains(system.getLeft())) systemNames.addLast(system.getLeft());
+                scores.getLast().addLast(system.getRight());
+            }
+        }
+
+        Gson gson = new Gson();
+
+        String namesJson = gson.toJson(names);
+        String systemNamesJson = gson.toJson(systemNames);
+        String scoresJson = gson.toJson(scores);
+
+        String msg = String.format(
+                "SVR RESULTS {GAMETYPE: \"%s\", USERS: %s, SCORETYPES: %s, SCORES: %s, TOURNAMENT: 1}",
+                "none", // TODO gametype
+                namesJson,
+                systemNamesJson,
+                scoresJson
+        );
+
+        for (var user : onlineUsers()) {
+            user.send(msg);
+        }
+    }
 }

framework/src/main/java/org/toop/framework/networking/server/client/NettyClient.java

@@ -56,7 +56,6 @@ public class NettyClient implements Client<OnlineTurnBasedGame, ServerPlayer> {
 
     @Override
     public void send(String message) {
-        IO.println(message);
         ctx.channel().writeAndFlush(message + "\r\n");
     }
 

framework/src/main/java/org/toop/framework/networking/server/handlers/MessageHandler.java

@@ -1,18 +1,17 @@
 package org.toop.framework.networking.server.handlers;
 
-import org.toop.framework.game.players.ServerPlayer;
-import org.toop.framework.networking.server.OnlineTurnBasedGame;
 import org.toop.framework.networking.server.Server;
 import org.toop.framework.networking.server.client.Client;
+import org.toop.framework.networking.server.client.NettyClient;
 import org.toop.framework.networking.server.parsing.ParsedMessage;
 import org.toop.framework.utils.Utils;
 
 public class MessageHandler implements Handler<ParsedMessage> {
 
     private final Server server;
-    private final Client<OnlineTurnBasedGame, ServerPlayer> client;
+    private final NettyClient client;
 
-    public MessageHandler(Server server, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    public MessageHandler(Server server, NettyClient client) {
         this.server = server;
         this.client = client;
     }
@@ -28,6 +27,7 @@ public class MessageHandler implements Handler<ParsedMessage> {
             case "challenge" -> handleChallenge(message, client);
             case "message" -> handleMessage(message, client);
             case "help" -> handleHelp(message, client);
+            case "tournament" -> handleTournament(message, client);
             default -> client.send("ERROR Unknown command");
         }
     }
@@ -41,27 +41,27 @@ public class MessageHandler implements Handler<ParsedMessage> {
         return true;
     }
 
-    private void handleLogin(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleLogin(ParsedMessage p, NettyClient client) {
         if (!hasArgs(p.args())) return;
 
         client.setName(p.args()[0]);
     }
 
-    private void handleSubscribe(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleSubscribe(ParsedMessage p, NettyClient client) {
         if (!hasArgs(p.args())) return;
 
         server.subscribeClient(client.name(), p.args()[0]);
     }
 
-    private void handleHelp(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleHelp(ParsedMessage p, NettyClient client) {
         // TODO
     }
 
-    private void handleMessage(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleMessage(ParsedMessage p, NettyClient client) {
         // TODO
     }
 
-    private void handleGet(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleGet(ParsedMessage p, NettyClient client) {
         if (!hasArgs(p.args())) return;
 
         switch (p.args()[0]) {
@@ -73,10 +73,14 @@ public class MessageHandler implements Handler<ParsedMessage> {
                 var names = server.gameTypes().stream().iterator();
                 client.send("SVR GAMELIST " + Utils.returnQuotedString(names));
             }
+            case "admins" -> {
+                var names = server.getAdmins().stream().map(Client::name).iterator();
+                client.send("SVR ADMINS " + Utils.returnQuotedString(names));
+            }
         }
     }
 
-    private void handleChallenge(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleChallenge(ParsedMessage p, NettyClient client) {
         if (!hasArgs(p.args())) return;
         if (p.args().length < 2) return;
 
@@ -101,10 +105,21 @@ public class MessageHandler implements Handler<ParsedMessage> {
         server.challengeClient(client.name(), p.args()[0], p.args()[1]);
     }
 
-    private void handleMove(ParsedMessage p, Client<OnlineTurnBasedGame, ServerPlayer> client) {
+    private void handleMove(ParsedMessage p, NettyClient client) {
         if(!hasArgs(p.args())) return;
 
+        var player = client.player();
+        if (player == null) return;
+
         // TODO check if not number
-        client.player().setMove(1L << Integer.parseInt(p.args()[0]));
+        player.setMove(1L << Integer.parseInt(p.args()[0]));
+    }
+
+    private void handleTournament(ParsedMessage p, NettyClient client) {
+        if(!hasArgs(p.args())) return;
+
+        if (p.args()[0].equalsIgnoreCase("start") && p.args().length > 1) {
+            server.startTournament(p.args()[1], client, false); // TODO add shuffle to msg
+        }
     }
 }

framework/src/main/java/org/toop/framework/networking/server/tournaments/AsyncTournamentRunner.java

@@ -0,0 +1,86 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.GameResultFuture;
+import org.toop.framework.networking.server.MatchExecutor;
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.matchmakers.MatchMaker;
+import org.toop.framework.networking.server.tournaments.scoresystems.IntegerScoreSystem;
+
+import java.time.Duration;
+import java.util.*;
+import java.util.concurrent.*;
+
+public class AsyncTournamentRunner implements TournamentRunner {
+
+    @Override
+    public void run(
+            MatchExecutor matchRunner,
+            MatchMaker matchMaker,
+            List<IntegerScoreSystem> scoreSystems,
+            ResultBroadcaster<IntegerScoreSystem> broadcaster,
+            Duration turnTime,
+            String gameType
+    ) {
+
+        ExecutorService matchExecutor = Executors.newVirtualThreadPerTaskExecutor();
+        ExecutorService scoringExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
+
+        Queue<TournamentMatch> pendingMatches = new ConcurrentLinkedQueue<>();
+        matchMaker.forEach(pendingMatches::add);
+
+        Set<NettyClient> busyPlayers = ConcurrentHashMap.newKeySet();
+        List<CompletableFuture<Void>> runningMatches = new CopyOnWriteArrayList<>();
+
+        try {
+            while (!pendingMatches.isEmpty() || !runningMatches.isEmpty()) {
+
+                Iterator<TournamentMatch> it = pendingMatches.iterator();
+                while (it.hasNext()) {
+                    TournamentMatch match = it.next();
+
+                    NettyClient a = match.getClient0();
+                    NettyClient b = match.getClient1();
+
+                    // TODO game != null doesn't work here, fix later
+                    if (busyPlayers.contains(a) || busyPlayers.contains(b)) {
+                        continue;
+                    }
+
+                    busyPlayers.add(a);
+                    busyPlayers.add(b);
+                    it.remove();
+
+                    CompletableFuture<Void> f =
+                            CompletableFuture.runAsync(() -> {
+                                try {
+                                    GameResultFuture game = matchRunner.submit(gameType, turnTime, a, b);
+
+                                    CompletableFuture.runAsync(
+                                            () -> scoreSystems.forEach(s -> s.result(match, game.result().join())),
+                                            scoringExecutor
+                                    ).join();
+                                } finally {
+                                    a.clearGame();
+                                    b.clearGame();
+                                    busyPlayers.remove(a);
+                                    busyPlayers.remove(b);
+                                }
+                            }, matchExecutor);
+
+                    runningMatches.add(f);
+
+                    f.whenComplete((_, _) -> runningMatches.remove(f));
+                }
+
+                Thread.sleep(10); // Safety
+            }
+
+            broadcaster.broadcast(scoreSystems);
+
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        } finally {
+            matchExecutor.shutdown();
+        }
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/BasicTournamentRunner.java

@@ -0,0 +1,40 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.GameResultFuture;
+import org.toop.framework.networking.server.MatchExecutor;
+import org.toop.framework.networking.server.tournaments.matchmakers.MatchMaker;
+import org.toop.framework.networking.server.tournaments.scoresystems.IntegerScoreSystem;
+
+import java.time.Duration;
+import java.util.List;
+import java.util.concurrent.*;
+
+public class BasicTournamentRunner implements TournamentRunner {
+    @Override
+    public void run(
+            MatchExecutor matchExecutor,
+            MatchMaker matchMaker,
+            List<IntegerScoreSystem> scoreSystems,
+            ResultBroadcaster<IntegerScoreSystem> broadcaster,
+            Duration turnTime,
+            String gameType
+    ) {
+        ExecutorService threadPool = Executors.newSingleThreadExecutor();
+        try {
+            threadPool.execute(() -> {
+                for (TournamentMatch match : matchMaker) {
+                    // Play game and await the results
+                    GameResultFuture game = matchExecutor.submit(gameType, turnTime, match.getClient0(), match.getClient1());
+                    scoreSystems.forEach(e -> e.result(match, game.result().join()));
+
+                    match.getClient0().clearGame();
+                    match.getClient1().clearGame();
+                }
+
+                broadcaster.broadcast(scoreSystems);
+            });
+        } finally {
+            threadPool.shutdown();
+        }
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/ResultBroadcaster.java

@@ -0,0 +1,10 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.tournaments.scoresystems.ScoreSystem;
+
+import java.util.List;
+
+@FunctionalInterface
+public interface ResultBroadcaster<T extends ScoreSystem<?, ?, ?>> {
+    void broadcast(List<T> scoreSystem);
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/Tournament.java

@@ -0,0 +1,121 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.MatchExecutor;
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.matchmakers.MatchMaker;
+import org.toop.framework.networking.server.tournaments.scoresystems.IntegerScoreSystem;
+import org.toop.framework.networking.server.tournaments.shufflers.Shuffler;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+public class Tournament {
+
+    private final MatchExecutor matchExecutor;
+    private final List<IntegerScoreSystem> scoreSystems;
+    private final TournamentRunner tournamentRunner;
+    private final MatchMaker matchMaker;
+    private final ResultBroadcaster<IntegerScoreSystem> broadcaster;
+    private final NettyClient[] players;
+    private final Duration turnTime;
+    private final Shuffler shuffler;
+
+    private Tournament(Tournament.Builder builder) {
+        matchExecutor = builder.matchExecutor;
+        scoreSystems = builder.scoreSystems;
+        tournamentRunner = builder.tournamentRunner;
+        matchMaker = builder.matchMaker;
+        broadcaster = builder.broadcaster;
+        players = builder.players;
+        turnTime = builder.turnTime;
+        shuffler = builder.shuffler;
+    }
+
+    public void run(String gameType) {
+
+        Arrays.stream(players).forEach(e -> {
+            matchMaker.addPlayer(e);
+            scoreSystems.forEach(k -> k.addPlayer(e));
+        });
+
+        if (shuffler != null) matchMaker.shuffle(shuffler);
+
+        tournamentRunner.run(matchExecutor, matchMaker, scoreSystems, broadcaster, turnTime, gameType);
+
+    }
+
+    public static class Builder {
+        private MatchExecutor matchExecutor;
+        private List<IntegerScoreSystem> scoreSystems = new ArrayList<>();
+        private TournamentRunner tournamentRunner;
+        private MatchMaker matchMaker;
+        private ResultBroadcaster<IntegerScoreSystem> broadcaster;
+        private NettyClient[] players;
+        private NettyClient[] observors;
+        private NettyClient[] admins;
+        private Duration turnTime = Duration.ofSeconds(10);
+        private Shuffler shuffler;
+
+        public Builder matchExecutor(MatchExecutor matchExecutor) {
+            this.matchExecutor = matchExecutor;
+            return this;
+        }
+
+        public Builder addScoreSystem(IntegerScoreSystem scoreSystem) {
+            this.scoreSystems.addLast(scoreSystem);
+            return this;
+        }
+
+        public Builder tournamentRunner(TournamentRunner tournamentRunner) {
+            this.tournamentRunner = tournamentRunner;
+            return this;
+        }
+
+        public Builder matchMaker(MatchMaker matchMaker) {
+            this.matchMaker = matchMaker;
+            return this;
+        }
+
+        public Builder resultBroadcaster(ResultBroadcaster<IntegerScoreSystem> broadcaster) {
+            this.broadcaster = broadcaster;
+            return this;
+        }
+
+        public Builder addPlayers(NettyClient[] players) {
+            this.players = players;
+            return this;
+        }
+
+        public Builder addObservers(NettyClient[] observors) { // TODO
+            this.observors = observors;
+            return this;
+        }
+
+        public Builder addAdmins(NettyClient[] admins) { // TODO
+            this.admins = admins;
+            return this;
+        }
+
+        public Builder turnTimeout(Duration turnTime) {
+            this.turnTime = turnTime;
+            return this;
+        }
+
+        public Builder addMatchShuffler(Shuffler shuffler) {
+            this.shuffler = shuffler;
+            return this;
+        }
+
+        public Tournament build() {
+            Objects.requireNonNull(matchExecutor, "matchExecutor");
+            Objects.requireNonNull(tournamentRunner, "tournamentRunner");
+            Objects.requireNonNull(matchMaker, "matchMaker");
+            Objects.requireNonNull(broadcaster, "resultBroadcaster"); // TODO is not always necessary and needs to be more generic, not just at the end
+            Objects.requireNonNull(players, "players");
+            return new Tournament(this);
+        }
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/TournamentMatch.java

@@ -0,0 +1,18 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.utils.ImmutablePair;
+
+public class TournamentMatch extends ImmutablePair<NettyClient, NettyClient> {
+    public TournamentMatch(NettyClient a, NettyClient b) {
+        super(a, b);
+    }
+
+    public NettyClient getClient0() {
+        return getLeft();
+    }
+
+    public NettyClient getClient1() {
+        return getRight();
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/TournamentRunner.java

@@ -0,0 +1,13 @@
+package org.toop.framework.networking.server.tournaments;
+
+import org.toop.framework.networking.server.MatchExecutor;
+import org.toop.framework.networking.server.tournaments.matchmakers.MatchMaker;
+import org.toop.framework.networking.server.tournaments.scoresystems.IntegerScoreSystem;
+
+import java.time.Duration;
+import java.util.List;
+
+public interface TournamentRunner {
+    void run(MatchExecutor matchExecutor, MatchMaker matchMaker, List<IntegerScoreSystem> scoreSystems,
+             ResultBroadcaster<IntegerScoreSystem> broadcaster, Duration turnTime, String gameType);
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/matchmakers/DoubleRoundRobinMatchMaker.java

@@ -0,0 +1,81 @@
+package org.toop.framework.networking.server.tournaments.matchmakers;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+import org.toop.framework.networking.server.tournaments.shufflers.Shuffler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class DoubleRoundRobinMatchMaker implements MatchMaker {
+
+    private final List<NettyClient> players = new ArrayList<>();
+
+    public DoubleRoundRobinMatchMaker() {} // TODO let user decide store type
+
+    @Override
+    public void addPlayer(NettyClient player) {
+        players.addLast(player);
+    }
+
+    @Override
+    public void shuffle(Shuffler shuffler) {
+        if (players.size() < 2) return;
+        shuffler.shuffle(players);
+    }
+
+    @Override
+    public List<NettyClient> getPlayers() {
+        return players;
+    }
+
+    @Override
+    public Iterator<TournamentMatch> iterator() {
+        return new Iterator<>() {
+
+            private int i = 0;
+            private int j = 1;
+            private boolean reverse = false;
+
+            @Override
+            public boolean hasNext() {
+                return players.size() > 1
+                        && i < players.size() - 1
+                        && j < players.size();
+            }
+
+            @Override
+            public TournamentMatch next() {
+                if (!hasNext()) {
+                    throw new NoSuchElementException();
+                }
+
+                NettyClient home = players.get(i);
+                NettyClient away = players.get(j);
+
+                TournamentMatch match = reverse ? new TournamentMatch(away, home) : new TournamentMatch(home, away);
+
+                advance();
+                return match;
+            }
+
+            private void advance() {
+                j++;
+                if (j >= players.size()) {
+                    i++;
+                    j = i + 1;
+
+                    if (i >= players.size() - 1) {
+                        if (!reverse) {
+                            reverse = true;
+                            i = 0;
+                            j = 1;
+                        }
+                    }
+                }
+            }
+        };
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/matchmakers/MatchMaker.java

@@ -0,0 +1,13 @@
+package org.toop.framework.networking.server.tournaments.matchmakers;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+import org.toop.framework.networking.server.tournaments.shufflers.Shuffler;
+
+import java.util.List;
+
+public interface MatchMaker extends Iterable<TournamentMatch> {
+    void addPlayer(NettyClient player);
+    List<NettyClient> getPlayers();
+    void shuffle(Shuffler shuffler);
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/matchmakers/RoundRobinMatchMaker.java

@@ -0,0 +1,67 @@
+package org.toop.framework.networking.server.tournaments.matchmakers;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+import org.toop.framework.networking.server.tournaments.shufflers.Shuffler;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+public class RoundRobinMatchMaker implements MatchMaker {
+
+    private final List<NettyClient> players = new ArrayList<>();
+
+    public RoundRobinMatchMaker() {} // TODO let user decide store type
+
+    @Override
+    public void addPlayer(NettyClient player) {
+        players.addLast(player);
+    }
+
+    @Override
+    public void shuffle(Shuffler shuffler) {
+        if (players.size() < 2) return;
+        shuffler.shuffle(players);
+    }
+
+    @Override
+    public List<NettyClient> getPlayers() {
+        return players;
+    }
+
+    @Override
+    public Iterator<TournamentMatch> iterator() {
+        return new Iterator<>() {
+
+            private int i = 0;
+            private int j = 1;
+
+            @Override
+            public boolean hasNext() {
+                return players.size() > 1
+                        && i < players.size() - 1
+                        && j < players.size();
+            }
+
+            @Override
+            public TournamentMatch next() {
+                if (!hasNext()) {
+                    throw new NoSuchElementException();
+                }
+
+                NettyClient home = players.get(i);
+                NettyClient away = players.get(j);
+
+                j++;
+                if (j >= players.size()) {
+                    i++;
+                    j = i + 1;
+                }
+
+                return new TournamentMatch(home, away);
+            }
+        };
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/DrawCountScoreSystem.java

@@ -0,0 +1,43 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class DrawCountScoreSystem implements IntegerScoreSystem {
+
+    private final Map<NettyClient, Integer> scores = new ConcurrentHashMap<>();
+    private final int INIT_SCORE = 0;
+    private final int WIN_POINTS = 1;
+
+    public DrawCountScoreSystem() {} // TODO let user decide store type
+
+    @Override
+    public String scoreName() {
+        return "draws";
+    }
+
+    @Override
+    public void addPlayer(NettyClient user) {
+        scores.putIfAbsent(user, INIT_SCORE);
+    }
+
+    @Override
+    public void result(TournamentMatch match, Integer result) {
+        switch (result) {
+            case 0, 1 -> {}
+            case -1 -> {
+                scores.merge(match.getClient0(), WIN_POINTS, Integer::sum);
+                scores.merge(match.getClient1(), WIN_POINTS, Integer::sum);
+            }
+            default -> throw new IllegalArgumentException("Unknown result: " + result);
+        }
+    }
+
+    @Override
+    public Map<NettyClient, Integer> getScore() {
+        return scores;
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/IntegerScoreSystem.java

@@ -0,0 +1,6 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+
+public interface IntegerScoreSystem extends ScoreSystem<TournamentMatch, Integer, NettyClient> {}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/LoseCountScoreSystem.java

@@ -0,0 +1,41 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class LoseCountScoreSystem implements IntegerScoreSystem {
+
+    private final Map<NettyClient, Integer> scores = new ConcurrentHashMap<>();
+    private final int INIT_SCORE = 0;
+    private final int WIN_POINTS = 1;
+
+    public LoseCountScoreSystem() {} // TODO let user decide store type
+
+    @Override
+    public String scoreName() {
+        return "loses";
+    }
+
+    @Override
+    public void addPlayer(NettyClient user) {
+        scores.putIfAbsent(user, INIT_SCORE);
+    }
+
+    @Override
+    public void result(TournamentMatch match, Integer result) {
+        switch (result) {
+            case 0 -> scores.merge(match.getClient1(), WIN_POINTS, Integer::sum);
+            case 1 -> scores.merge(match.getClient0(), WIN_POINTS, Integer::sum);
+            case -1 -> {} // Draw
+            default -> throw new IllegalArgumentException("Unknown result: " + result);
+        }
+    }
+
+    @Override
+    public Map<NettyClient, Integer> getScore() {
+        return scores;
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/MatchCountScoreSystem.java

@@ -0,0 +1,37 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class MatchCountScoreSystem implements IntegerScoreSystem {
+
+    private final Map<NettyClient, Integer> scores = new ConcurrentHashMap<>();
+    private final int INIT_SCORE = 0;
+    private final int WIN_POINTS = 1;
+
+    public MatchCountScoreSystem() {} // TODO let user decide store type
+
+    @Override
+    public String scoreName() {
+        return "matches";
+    }
+
+    @Override
+    public void addPlayer(NettyClient user) {
+        scores.putIfAbsent(user, INIT_SCORE);
+    }
+
+    @Override
+    public void result(TournamentMatch match, Integer result) {
+        scores.merge(match.getClient0(), WIN_POINTS, Integer::sum);
+        scores.merge(match.getClient1(), WIN_POINTS, Integer::sum);
+    }
+
+    @Override
+    public Map<NettyClient, Integer> getScore() {
+        return scores;
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/ScoreSystem.java

@@ -0,0 +1,10 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import java.util.Map;
+
+public interface ScoreSystem<MATCHTYPE, SCORETYPE, USERTYPE> {
+    String scoreName();
+    void addPlayer(USERTYPE user);
+    void result(MATCHTYPE match, SCORETYPE result);
+    Map<USERTYPE, SCORETYPE> getScore();
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/scoresystems/WinCountScoreSystem.java

@@ -0,0 +1,41 @@
+package org.toop.framework.networking.server.tournaments.scoresystems;
+
+import org.toop.framework.networking.server.client.NettyClient;
+import org.toop.framework.networking.server.tournaments.TournamentMatch;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class WinCountScoreSystem implements IntegerScoreSystem {
+
+    private final Map<NettyClient, Integer> scores = new ConcurrentHashMap<>();
+    private final int INIT_SCORE = 0;
+    private final int WIN_POINTS = 1;
+
+    public WinCountScoreSystem() {} // TODO let user decide store type
+
+    @Override
+    public String scoreName() {
+        return "wins";
+    }
+
+    @Override
+    public void addPlayer(NettyClient user) {
+        scores.putIfAbsent(user, INIT_SCORE);
+    }
+
+    @Override
+    public void result(TournamentMatch match, Integer result) {
+        switch (result) {
+            case 0 -> scores.merge(match.getClient0(), WIN_POINTS, Integer::sum);
+            case 1 -> scores.merge(match.getClient1(), WIN_POINTS, Integer::sum);
+            case -1 -> {} // Draw
+            default -> throw new IllegalArgumentException("Unknown result: " + result);
+        }
+    }
+
+    @Override
+    public Map<NettyClient, Integer> getScore() {
+        return scores;
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/shufflers/RandomShuffle.java

@@ -0,0 +1,20 @@
+package org.toop.framework.networking.server.tournaments.shufflers;
+
+import java.util.List;
+import java.util.Random;
+
+public class RandomShuffle implements Shuffler {
+    @Override
+    public <T> void shuffle(List<T> listToShuffle) {
+        final int SHUFFLE_AMOUNT = listToShuffle.size() * 2;
+
+        Random rand = new Random();
+
+        for (int i = 0; i <= SHUFFLE_AMOUNT; i++) {
+            int index = rand.nextInt(listToShuffle.size());
+            T match = listToShuffle.get(index);
+            listToShuffle.remove(index);
+            listToShuffle.addLast(match);
+        }
+    }
+}

framework/src/main/java/org/toop/framework/networking/server/tournaments/shufflers/Shuffler.java

@@ -0,0 +1,7 @@
+package org.toop.framework.networking.server.tournaments.shufflers;
+
+import java.util.List;
+
+public interface Shuffler {
+    <T> void shuffle(List<T> listToShuffle);
+}

game/src/main/java/org/toop/game/players/ai/MCTSAI.java

@@ -1,193 +1,298 @@
 package org.toop.game.players.ai;
 
-import org.toop.framework.gameFramework.GameState;
-import org.toop.framework.gameFramework.model.game.PlayResult;
 import org.toop.framework.gameFramework.model.game.TurnBasedGame;
 import org.toop.framework.gameFramework.model.player.AbstractAI;
 
 import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public abstract class MCTSAI extends AbstractAI {
+	protected static class Node {
+		public static final int VIRTUAL_LOSS = -1;
 
-public class MCTSAI extends AbstractAI {
-	private static class Node {
 		public TurnBasedGame state;
+
 		public long move;
+		public long unexpandedMoves;
 
 		public Node parent;
-
-		public int expanded;
 		public Node[] children;
 
-		public int visits;
+		public AtomicInteger value;
-		public float value;
+		public AtomicInteger visits;
+
+		public float heuristic;
+
+		public float solved;
+
+		public Node(TurnBasedGame state, Node parent, long move) {
+			final long legalMoves = state.getLegalMoves();
 
-		public Node(TurnBasedGame state, long move, Node parent) {
 			this.state = state;
+
 			this.move = move;
+			this.unexpandedMoves = legalMoves;
 
 			this.parent = parent;
+			this.children = new Node[Long.bitCount(legalMoves)];
 
-			this.expanded = 0;
+			this.value = new AtomicInteger(0);
-			this.children = new Node[Long.bitCount(state.getLegalMoves())];
+			this.visits = new AtomicInteger(0);
 
-			this.visits = 0;
+			this.heuristic = state.rateMove(move);
-			this.value = 0.0f;
+
+			this.solved = Float.NaN;
 		}
 
 		public Node(TurnBasedGame state) {
-			this(state, 0L, null);
+			this(state, null, 0L);
+		}
+
+		public int getExpanded() {
+			return children.length - Long.bitCount(unexpandedMoves);
 		}
 
 		public boolean isFullyExpanded() {
-			return expanded >= children.length;
+			return unexpandedMoves == 0L;
 		}
 
-		float calculateUCT() {
+		public float calculateUCT(float explorationFactor) {
-			float exploitation = visits <= 0? 0 : value / visits;
+			if (visits.get() == 0) {
-			float exploration = 1.41f * (float)(Math.sqrt(Math.log(visits) / visits));
+				return Float.POSITIVE_INFINITY;
+			}
 
-			return exploitation + exploration;
+			final float exploitation = (float) value.get() / visits.get();
+			final float exploration = (float)(Math.sqrt(explorationFactor / visits.get()));
+			final float bias = heuristic * 10.0f / (visits.get() + 1);
+
+			return exploitation + exploration + bias;
 		}
 
 		public Node bestUCTChild() {
-			int bestChildIndex = -1;
+			final int expanded = getExpanded();
-			float bestScore = Float.NEGATIVE_INFINITY;
+
+			Node highestUCTChild = null;
+			float highestUCT = Float.NEGATIVE_INFINITY;
 
 			for (int i = 0; i < expanded; i++) {
-				final float score = calculateUCT();
+				final float childUCT = children[i].calculateUCT(2.0f * (float)Math.log(visits.get()));
 
-				if (score > bestScore) {
+				if (childUCT > highestUCT) {
-					bestChildIndex = i;
+					highestUCTChild = children[i];
-					bestScore = score;
+					highestUCT = childUCT;
 				}
 			}
 
-			return bestChildIndex >= 0? children[bestChildIndex] : this;
+			return highestUCTChild;
 		}
 	}
 
-	private final int milliseconds;
+	protected static final ThreadLocal<Random> random = ThreadLocal.withInitial(Random::new);
+
+	protected final int milliseconds;
+
+	protected int lastIterations;
 
 	public MCTSAI(int milliseconds) {
 		this.milliseconds = milliseconds;
+
+		this.lastIterations = 0;
 	}
 
 	public MCTSAI(MCTSAI other) {
 		this.milliseconds = other.milliseconds;
+
+		this.lastIterations = other.lastIterations;
 	}
 
-	@Override
+	public int getLastIterations() {
-	public MCTSAI deepCopy() {
+		return lastIterations;
-		return new MCTSAI(this);
 	}
 
-	@Override
+	protected Node selection(Node root) {
-	public long getMove(TurnBasedGame game) {
+		while (Float.isNaN(root.solved) && root.isFullyExpanded() && !root.state.isTerminal()) {
-		Node root = new Node(game.deepCopy());
+			root.value.addAndGet(Node.VIRTUAL_LOSS);
+			root.visits.incrementAndGet();
 
-		long endTime = System.currentTimeMillis() + milliseconds;
+			root = root.bestUCTChild();
-
-		while (System.currentTimeMillis() <= endTime) {
-			Node node = selection(root);
-			long legalMoves = node.state.getLegalMoves();
-
-			if (legalMoves != 0) {
-				node = expansion(node, legalMoves);
-			}
-
-			float result = 0.0f;
-
-			if (node.state.getLegalMoves() != 0) {
-				result = simulation(node.state, game.getCurrentTurn());
-			}
-
-			backPropagation(node, result);
 		}
 
-		int mostVisitedIndex = -1;
+		root.value.addAndGet(Node.VIRTUAL_LOSS);
-		int mostVisits = -1;
+		root.visits.incrementAndGet();
 
-		for (int i = 0; i < root.expanded; i++) {
+		return root;
-			if (root.children[i].visits > mostVisits) {
+	}
-				mostVisitedIndex = i;
+
-				mostVisits = root.children[i].visits;
+	protected Node expansion(Node leaf) {
+		synchronized (leaf) {
+			if (leaf.unexpandedMoves == 0L) {
+				return leaf;
+			}
+
+			final long unexpandedMove = leaf.unexpandedMoves & -leaf.unexpandedMoves;
+
+			final TurnBasedGame copiedState = leaf.state.deepCopy();
+			copiedState.play(unexpandedMove);
+
+			final Node expandedChild = new Node(copiedState, leaf, unexpandedMove);
+
+			leaf.children[leaf.getExpanded()] = expandedChild;
+			leaf.unexpandedMoves &= ~unexpandedMove;
+
+			return expandedChild;
+		}
+	}
+
+	protected int simulation(Node leaf) {
+		final TurnBasedGame copiedState = leaf.state.deepCopy();
+		final int playerIndex = 1 - copiedState.getCurrentTurn();
+
+		while (!copiedState.isTerminal()) {
+			final long legalMoves = copiedState.getLegalMoves();
+			final long randomMove = randomSetBit(legalMoves);
+
+			copiedState.play(randomMove);
+		}
+
+		if (copiedState.getWinner() == playerIndex) {
+			return 1;
+		}
+
+		if (copiedState.getWinner() >= 0) {
+			return -1;
+		}
+
+		return 0;
+	}
+
+	protected void backPropagation(Node leaf, int value) {
+		while (leaf != null) {
+			value -= Node.VIRTUAL_LOSS;
+			leaf.value.addAndGet(value);
+
+			if (Float.isNaN(leaf.solved)) {
+				updateSolvedStatus(leaf);
+			}
+
+			value = -value;
+			leaf = leaf.parent;
+		}
+	}
+
+	protected Node mostVisitedChild(Node root) {
+		final int expanded = root.getExpanded();
+
+		Node mostVisitedChild = null;
+		int mostVisited = -1;
+
+		for (int i = 0; i < expanded; i++) {
+			if (root.children[i].visits.get() > mostVisited) {
+				mostVisitedChild = root.children[i];
+				mostVisited = root.children[i].visits.get();
 			}
 		}
 
-		return mostVisitedIndex != -1? root.children[mostVisitedIndex].move : randomSetBit(game.getLegalMoves());
+		return mostVisitedChild;
 	}
 
-	private Node selection(Node node) {
+	protected Node findOrResetRoot(Node root, TurnBasedGame game) {
-		while (node.state.getLegalMoves() != 0L && node.isFullyExpanded()) {
+		if (root == null) {
-			node = node.bestUCTChild();
+			return new Node(game.deepCopy());
 		}
 
-		return node;
+		if (areStatesEqual(root.state.getBoard(), game.getBoard())) {
-	}
+			return root;
-
-	private Node expansion(Node node, long legalMoves) {
-		for (int i = 0; i < node.expanded; i++) {
-			legalMoves &= ~node.children[i].move;
 		}
 
-		if (legalMoves == 0L) {
+		final int expanded = root.getExpanded();
-			return node;
-		}
 
-		long move = randomSetBit(legalMoves);
+		for (int i = 0; i < expanded; i++) {
-
+			if (areStatesEqual(root.children[i].state.getBoard(), game.getBoard())) {
-		TurnBasedGame copy = node.state.deepCopy();
+				root.children[i].parent = null;
-		copy.play(move);
+				return root.children[i];
-
-		Node newlyExpanded = new Node(copy, move, node);
-
-		node.children[node.expanded] = newlyExpanded;
-		node.expanded++;
-
-		return newlyExpanded;
-	}
-
-	private float simulation(TurnBasedGame state, int playerIndex) {
-		TurnBasedGame copy = state.deepCopy();
-		long legalMoves = copy.getLegalMoves();
-		PlayResult result = null;
-
-		while (legalMoves != 0) {
-			result = copy.play(randomSetBit(legalMoves));
-			legalMoves = copy.getLegalMoves();
-		}
-
-		if (result.state() == GameState.WIN) {
-			if (result.player() == playerIndex) {
-				return 1.0f;
 			}
-
-			return -1.0f;
 		}
 
-		return -0.2f;
+		return new Node(game.deepCopy());
 	}
 
-	private void backPropagation(Node node, float value) {
+	protected Node findChildByMove(Node root, long move) {
-		while (node != null) {
+		final int expanded = root.getExpanded();
-			node.visits++;
-			node.value += value;
-			node = node.parent;
-		}
-	}
 
-	public static long randomSetBit(long value) {
+		for (int i = 0; i < expanded; i++) {
-		Random random = new Random();
+			if (root.children[i].move == move) {
-
+				root.children[i].parent = null;
-		int count = Long.bitCount(value);
+				return root.children[i];
-		int target = random.nextInt(count);
-
-		while (true) {
-			int bit = Long.numberOfTrailingZeros(value);
-			if (target == 0) {
-				return 1L << bit;
 			}
+		}
+
+		return null;
+	}
+
+	protected boolean areStatesEqual(long[] state1, long[] state2) {
+		if (state1.length != state2.length) {
+			return false;
+		}
+
+		for (int i = 0; i < state1.length; i++) {
+			if (state1[i] != state2[i]) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	protected long randomSetBit(long value) {
+		if (0L == value) {
+			return 0;
+		}
+
+		final int bitCount = Long.bitCount(value);
+		final int randomBitCount = random.get().nextInt(bitCount);
+
+		for (int i = 0; i < randomBitCount; i++) {
 			value &= value - 1;
-			target--;
+		}
+
+		return value & -value;
+	}
+
+	private void updateSolvedStatus(Node node) {
+		if (node.state.isTerminal()) {
+			final int winner = node.state.getWinner();
+			final int mover = 1 - node.state.getCurrentTurn();
+
+			node.solved = winner == mover? 1.0f : winner == -1? 0.0f : -1.0f;
+
+			return;
+		}
+
+		if (node.isFullyExpanded()) {
+			boolean allChildrenSolved = true;
+			boolean foundWinningMove = false;
+			boolean foundDrawMove = false;
+
+			for (final Node child : node.children) {
+				if (!Float.isNaN(child.solved)) {
+					if (child.solved == -1.0f) {
+						foundWinningMove = true;
+						break;
+					}
+
+					if (child.solved == 0.0f) {
+						foundDrawMove = true;
+					}
+				} else {
+					allChildrenSolved = false;
+				}
+			}
+
+			if (foundWinningMove) {
+				node.solved = 1.0f;
+			} else if (allChildrenSolved) {
+				node.solved = foundDrawMove? 0.0f : -1.0f;
+			}
 		}
 	}
 }

game/src/main/java/org/toop/game/players/ai/MCTSAI2.java

@@ -1,195 +0,0 @@
-package org.toop.game.players.ai;
-
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.AbstractAI;
-
-import java.util.Random;
-
-public class MCTSAI2 extends AbstractAI {
-	private static class Node {
-		public TurnBasedGame state;
-
-		public long move;
-		public long unexpandedMoves;
-
-		public Node parent;
-
-		public Node[] children;
-		public int expanded;
-
-		public float value;
-		public int visits;
-
-		public Node(TurnBasedGame state, Node parent, long move) {
-			final long legalMoves = state.getLegalMoves();
-
-			this.state = state;
-
-			this.move = move;
-			this.unexpandedMoves = legalMoves;
-
-			this.parent = parent;
-
-			this.children = new Node[Long.bitCount(legalMoves)];
-			this.expanded = 0;
-
-			this.value = 0.0f;
-			this.visits = 0;
-		}
-
-		public Node(TurnBasedGame state) {
-			this(state, null, 0L);
-		}
-
-		public boolean isFullyExpanded() {
-			return expanded == children.length;
-		}
-
-		public float calculateUCT(int parentVisits) {
-			final float exploitation = value / visits;
-			final float exploration = 1.41f * (float)(Math.sqrt(Math.log(parentVisits) / visits));
-
-			return exploitation + exploration;
-		}
-
-		public Node bestUCTChild() {
-			Node highestUCTChild = null;
-			float highestUCT = Float.NEGATIVE_INFINITY;
-
-			for (int i = 0; i < expanded; i++) {
-				final float childUCT = children[i].calculateUCT(visits);
-
-				if (childUCT > highestUCT) {
-					highestUCTChild = children[i];
-					highestUCT = childUCT;
-				}
-
-			}
-
-			return highestUCTChild;
-		}
-	}
-
-	private final Random random;
-	private final int milliseconds;
-
-	public MCTSAI2(int milliseconds) {
-		this.random = new Random();
-		this.milliseconds = milliseconds;
-	}
-
-	public MCTSAI2(MCTSAI2 other) {
-		this.random = other.random;
-		this.milliseconds = other.milliseconds;
-	}
-
-	@Override
-	public MCTSAI2 deepCopy() {
-		return new MCTSAI2(this);
-	}
-
-	@Override
-	public long getMove(TurnBasedGame game) {
-		final Node root = new Node(game, null, 0L);
-
-		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
-
-		while (System.nanoTime() < endTime) {
-			Node leaf = selection(root);
-			leaf = expansion(leaf);
-			final float value = simulation(leaf);
-			backPropagation(leaf, value);
-		}
-
-		final Node mostVisitedChild = mostVisitedChild(root);
-
-		return mostVisitedChild != null? mostVisitedChild.move : 0L;
-	}
-
-	private Node mostVisitedChild(Node root) {
-		Node mostVisitedChild = null;
-		int mostVisited = -1;
-
-		for (int i = 0; i < root.expanded; i++) {
-			if (root.children[i].visits > mostVisited) {
-				mostVisitedChild = root.children[i];
-				mostVisited = root.children[i].visits;
-			}
-		}
-
-		return mostVisitedChild;
-	}
-
-	private Node selection(Node root) {
-		while (root.isFullyExpanded() && !root.state.isTerminal()) {
-			root = root.bestUCTChild();
-		}
-
-		return root;
-	}
-
-	private Node expansion(Node leaf) {
-		if (leaf.unexpandedMoves == 0L) {
-			return leaf;
-		}
-
-		final long unexpandedMove = leaf.unexpandedMoves & -leaf.unexpandedMoves;
-
-		final TurnBasedGame copiedState = leaf.state.deepCopy();
-		copiedState.play(unexpandedMove);
-
-		final Node expandedChild = new Node(copiedState, leaf, unexpandedMove);
-
-		leaf.children[leaf.expanded] = expandedChild;
-		leaf.expanded++;
-
-		leaf.unexpandedMoves &= ~unexpandedMove;
-
-		return expandedChild;
-	}
-
-	private float simulation(Node leaf) {
-		final TurnBasedGame copiedState = leaf.state.deepCopy();
-		final int playerIndex = 1 - copiedState.getCurrentTurn();
-
-		while (!copiedState.isTerminal()) {
-			final long legalMoves = copiedState.getLegalMoves();
-			final long randomMove = randomSetBit(legalMoves);
-
-			copiedState.play(randomMove);
-		}
-
-		if (copiedState.getWinner() == playerIndex) {
-			return 1.0f;
-		} else if (copiedState.getWinner() >= 0) {
-			return -1.0f;
-		}
-
-		return 0.0f;
-	}
-
-	private void backPropagation(Node leaf, float value) {
-		while (leaf != null) {
-			leaf.value += value;
-			leaf.visits++;
-
-			value = -value;
-			leaf = leaf.parent;
-		}
-	}
-
-	private long randomSetBit(long value) {
-		if (0L == value) {
-			return 0;
-		}
-
-		final int bitCount = Long.bitCount(value);
-		final int randomBitCount = random.nextInt(bitCount);
-
-		for (int i = 0; i < randomBitCount; i++) {
-			value &= value - 1;
-		}
-
-		return value & -value;
-	}
-}

game/src/main/java/org/toop/game/players/ai/MCTSAI3.java

@@ -1,258 +0,0 @@
-package org.toop.game.players.ai;
-
-import org.toop.framework.gameFramework.model.game.TurnBasedGame;
-import org.toop.framework.gameFramework.model.player.AbstractAI;
-
-import java.util.Random;
-
-public class MCTSAI3 extends AbstractAI {
-	private static class Node {
-		public TurnBasedGame state;
-
-		public long move;
-		public long unexpandedMoves;
-
-		public Node parent;
-
-		public Node[] children;
-		public int expanded;
-
-		public float value;
-		public int visits;
-
-		public Node(TurnBasedGame state, Node parent, long move) {
-			final long legalMoves = state.getLegalMoves();
-
-			this.state = state;
-
-			this.move = move;
-			this.unexpandedMoves = legalMoves;
-
-			this.parent = parent;
-
-			this.children = new Node[Long.bitCount(legalMoves)];
-			this.expanded = 0;
-
-			this.value = 0.0f;
-			this.visits = 0;
-		}
-
-		public Node(TurnBasedGame state) {
-			this(state, null, 0L);
-		}
-
-		public boolean isFullyExpanded() {
-			return expanded == children.length;
-		}
-
-		public float calculateUCT(int parentVisits) {
-			final float exploitation = value / visits;
-			final float exploration = 1.41f * (float)(Math.sqrt(Math.log(parentVisits) / visits));
-
-			return exploitation + exploration;
-		}
-
-		public Node bestUCTChild() {
-			Node highestUCTChild = null;
-			float highestUCT = Float.NEGATIVE_INFINITY;
-
-			for (int i = 0; i < expanded; i++) {
-				final float childUCT = children[i].calculateUCT(visits);
-
-				if (childUCT > highestUCT) {
-					highestUCTChild = children[i];
-					highestUCT = childUCT;
-				}
-
-			}
-
-			return highestUCTChild;
-		}
-	}
-
-	private final Random random;
-
-	private Node root;
-	private final int milliseconds;
-
-	public MCTSAI3(int milliseconds) {
-		this.random = new Random();
-
-		this.root = null;
-		this.milliseconds = milliseconds;
-	}
-
-	public MCTSAI3(MCTSAI3 other) {
-		this.random = other.random;
-
-		this.root = other.root;
-		this.milliseconds = other.milliseconds;
-	}
-
-	@Override
-	public MCTSAI3 deepCopy() {
-		return new MCTSAI3(this);
-	}
-
-	@Override
-	public long getMove(TurnBasedGame game) {
-		detectRoot(game);
-
-		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
-
-		while (System.nanoTime() < endTime) {
-			Node leaf = selection(root);
-			leaf = expansion(leaf);
-			final float value = simulation(leaf);
-			backPropagation(leaf, value);
-		}
-
-		final Node mostVisitedChild = mostVisitedChild(root);
-		final long move = mostVisitedChild != null? mostVisitedChild.move : 0L;
-
-		newRoot(move);
-
-		return move;
-	}
-
-	private Node mostVisitedChild(Node root) {
-		Node mostVisitedChild = null;
-		int mostVisited = -1;
-
-		for (int i = 0; i < root.expanded; i++) {
-			if (root.children[i].visits > mostVisited) {
-				mostVisitedChild = root.children[i];
-				mostVisited = root.children[i].visits;
-			}
-		}
-
-		return mostVisitedChild;
-	}
-
-	private void detectRoot(TurnBasedGame game) {
-		if (root == null) {
-			root = new Node(game.deepCopy());
-			return;
-		}
-
-		final long[] currentBoards = game.getBoard();
-		final long[] rootBoards = root.state.getBoard();
-
-		boolean detected = true;
-
-		for (int i = 0; i < rootBoards.length; i++) {
-			if (rootBoards[i] != currentBoards[i]) {
-				detected = false;
-				break;
-			}
-		}
-
-		if (detected) {
-			return;
-		}
-
-		for (int i = 0; i < root.expanded; i++) {
-			final Node child = root.children[i];
-
-			final long[] childBoards = child.state.getBoard();
-
-			detected = true;
-
-			for (int j = 0; j < childBoards.length; j++) {
-				if (childBoards[j] != currentBoards[j]) {
-					detected = false;
-					break;
-				}
-			}
-
-			if (detected) {
-				root = child;
-				return;
-			}
-		}
-
-		root = new Node(game.deepCopy());
-	}
-
-	private void newRoot(long move) {
-		for (final Node child : root.children) {
-			if (child.move == move) {
-				root = child;
-				break;
-			}
-		}
-	}
-
-	private Node selection(Node root) {
-		while (root.isFullyExpanded() && !root.state.isTerminal()) {
-			root = root.bestUCTChild();
-		}
-
-		return root;
-	}
-
-	private Node expansion(Node leaf) {
-		if (leaf.unexpandedMoves == 0L) {
-			return leaf;
-		}
-
-		final long unexpandedMove = leaf.unexpandedMoves & -leaf.unexpandedMoves;
-
-		final TurnBasedGame copiedState = leaf.state.deepCopy();
-		copiedState.play(unexpandedMove);
-
-		final Node expandedChild = new Node(copiedState, leaf, unexpandedMove);
-
-		leaf.children[leaf.expanded] = expandedChild;
-		leaf.expanded++;
-
-		leaf.unexpandedMoves &= ~unexpandedMove;
-
-		return expandedChild;
-	}
-
-	private float simulation(Node leaf) {
-		final TurnBasedGame copiedState = leaf.state.deepCopy();
-		final int playerIndex = 1 - copiedState.getCurrentTurn();
-
-		while (!copiedState.isTerminal()) {
-			final long legalMoves = copiedState.getLegalMoves();
-			final long randomMove = randomSetBit(legalMoves);
-
-			copiedState.play(randomMove);
-		}
-
-		if (copiedState.getWinner() == playerIndex) {
-			return 1.0f;
-		} else if (copiedState.getWinner() >= 0) {
-			return -1.0f;
-		}
-
-		return 0.0f;
-	}
-
-	private void backPropagation(Node leaf, float value) {
-		while (leaf != null) {
-			leaf.value += value;
-			leaf.visits++;
-
-			value = -value;
-			leaf = leaf.parent;
-		}
-	}
-
-	private long randomSetBit(long value) {
-		if (0L == value) {
-			return 0;
-		}
-
-		final int bitCount = Long.bitCount(value);
-		final int randomBitCount = random.nextInt(bitCount);
-
-		for (int i = 0; i < randomBitCount; i++) {
-			value &= value - 1;
-		}
-
-		return value & -value;
-	}
-}

game/src/main/java/org/toop/game/players/ai/mcts/MCTSAI1.java

@@ -0,0 +1,38 @@
+package org.toop.game.players.ai.mcts;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.game.players.ai.MCTSAI;
+
+public class MCTSAI1 extends MCTSAI {
+	public MCTSAI1(int milliseconds) {
+		super(milliseconds);
+	}
+
+	public MCTSAI1(MCTSAI1 other) {
+		super(other);
+	}
+
+	@Override
+	public MCTSAI1 deepCopy() {
+		return new MCTSAI1(this);
+	}
+
+	@Override
+	public long getMove(TurnBasedGame game) {
+		final Node root = new Node(game, null, 0L);
+
+		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
+
+		while (Float.isNaN(root.solved) && System.nanoTime() < endTime) {
+			Node leaf = selection(root);
+			leaf = expansion(leaf);
+			final int value = simulation(leaf);
+			backPropagation(leaf, value);
+		}
+
+		lastIterations = root.visits.get();
+
+		final Node mostVisitedChild = mostVisitedChild(root);
+		return mostVisitedChild.move;
+	}
+}

game/src/main/java/org/toop/game/players/ai/mcts/MCTSAI2.java

@@ -0,0 +1,48 @@
+package org.toop.game.players.ai.mcts;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.game.players.ai.MCTSAI;
+
+public class MCTSAI2 extends MCTSAI {
+	private Node root;
+
+	public MCTSAI2(int milliseconds) {
+		super(milliseconds);
+
+		this.root = null;
+	}
+
+	public MCTSAI2(MCTSAI2 other) {
+		super(other);
+
+		this.root = other.root;
+	}
+
+	@Override
+	public MCTSAI2 deepCopy() {
+		return new MCTSAI2(this);
+	}
+
+	@Override
+	public long getMove(TurnBasedGame game) {
+		root = findOrResetRoot(root, game);
+
+		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
+
+		while (Float.isNaN(root.solved) && System.nanoTime() < endTime) {
+			Node leaf = selection(root);
+			leaf = expansion(leaf);
+			final int value = simulation(leaf);
+			backPropagation(leaf, value);
+		}
+
+		lastIterations = root.visits.get();
+
+		final Node mostVisitedChild = mostVisitedChild(root);
+		final long move = mostVisitedChild.move;
+
+		root = findChildByMove(root, move);
+
+		return move;
+	}
+}

game/src/main/java/org/toop/game/players/ai/mcts/MCTSAI3.java

@@ -0,0 +1,63 @@
+package org.toop.game.players.ai.mcts;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.game.players.ai.MCTSAI;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class MCTSAI3 extends MCTSAI {
+	private static final int THREADS = 8;
+
+	private static final ExecutorService threadPool = Executors.newFixedThreadPool(THREADS);
+
+	public MCTSAI3(int milliseconds) {
+		super(milliseconds);
+	}
+
+	public MCTSAI3(MCTSAI3 other) {
+		super(other);
+	}
+
+	@Override
+	public MCTSAI3 deepCopy() {
+		return new MCTSAI3(this);
+	}
+
+	@Override
+	public long getMove(TurnBasedGame game) {
+		final Node root = new Node(game.deepCopy(), null, 0L);
+
+		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
+
+		for (int i = 0; i < THREADS; i++) {
+			threadPool.submit(() -> iterate(root, endTime));
+		}
+
+		try {
+			threadPool.awaitTermination(milliseconds + 50, TimeUnit.MILLISECONDS);
+
+			lastIterations = root.visits.get();
+
+			final Node mostVisitedChild = mostVisitedChild(root);
+			return mostVisitedChild.move;
+		} catch (Exception _) {
+			lastIterations = 0;
+
+			final long legalMoves = game.getLegalMoves();
+			return randomSetBit(legalMoves);
+		}
+	}
+
+	private Void iterate(Node root, long endTime) {
+		while (Float.isNaN(root.solved) && System.nanoTime() < endTime) {
+			Node leaf = selection(root);
+			leaf = expansion(leaf);
+			final int value = simulation(leaf);
+			backPropagation(leaf, value);
+		}
+
+		return null;
+	}
+}

game/src/main/java/org/toop/game/players/ai/mcts/MCTSAI4.java

@@ -0,0 +1,73 @@
+package org.toop.game.players.ai.mcts;
+
+import org.toop.framework.gameFramework.model.game.TurnBasedGame;
+import org.toop.game.players.ai.MCTSAI;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class MCTSAI4 extends MCTSAI {
+	private static final int THREADS = Runtime.getRuntime().availableProcessors();
+
+	private static final ExecutorService threadPool = Executors.newFixedThreadPool(THREADS);
+
+	private Node root;
+
+	public MCTSAI4(int milliseconds) {
+		super(milliseconds);
+
+		this.root = null;
+	}
+
+	public MCTSAI4(MCTSAI4 other) {
+		super(other);
+
+		this.root = other.root;
+	}
+
+	@Override
+	public MCTSAI4 deepCopy() {
+		return new MCTSAI4(this);
+	}
+
+	@Override
+	public long getMove(TurnBasedGame game) {
+		root = findOrResetRoot(root, game);
+
+		final long endTime = System.nanoTime() + milliseconds * 1_000_000L;
+
+		for (int i = 0; i < THREADS; i++) {
+			threadPool.submit(() -> iterate(root, endTime));
+		}
+
+		try {
+			threadPool.awaitTermination(milliseconds + 50, TimeUnit.MILLISECONDS);
+
+			lastIterations = root.visits.get();
+
+			final Node mostVisitedChild = mostVisitedChild(root);
+			final long move = mostVisitedChild.move;
+
+			root = findChildByMove(root, move);
+
+			return move;
+		} catch (Exception _) {
+			lastIterations = 0;
+
+			final long legalMoves = game.getLegalMoves();
+			return randomSetBit(legalMoves);
+		}
+	}
+
+	private Void iterate(Node root, long endTime) {
+		while (Float.isNaN(root.solved) && System.nanoTime() < endTime) {
+			Node leaf = selection(root);
+			leaf = expansion(leaf);
+			final int value = simulation(leaf);
+			backPropagation(leaf, value);
+		}
+
+		return null;
+	}
+}

game/src/test/java/research/AIData.java

@@ -0,0 +1,77 @@
+package research;
+
+public class AIData {
+    public String AI;
+    public long gamesPlayed;
+    public double winrate;
+    public double averageIterations;
+    public double averageIterations10;
+    public double averageIterations20;
+    public double averageIterations30;
+
+    public AIData(String AI, long gamesPlayed, double winrate, double averageIterations, double averageIterations10, double averageIterations20, double averageIterations30) {
+        this.AI = AI;
+        this.gamesPlayed = gamesPlayed;
+        this.winrate = winrate;
+        this.averageIterations = averageIterations;
+        this.averageIterations10 = averageIterations10;
+        this.averageIterations20 = averageIterations20;
+        this.averageIterations30 = averageIterations30;
+    }
+
+    public String getAI() {
+        return AI;
+    }
+
+    public void setAI(String AI) {
+        this.AI = AI;
+    }
+
+    public long getGamesPlayed() {
+        return gamesPlayed;
+    }
+
+    public void setGamesPlayed(long gamesPlayed) {
+        this.gamesPlayed = gamesPlayed;
+    }
+
+    public double getWinrate() {
+        return winrate;
+    }
+
+    public void setWinrate(double winrate) {
+        this.winrate = winrate;
+    }
+
+    public double getAverageIterations() {
+        return averageIterations;
+    }
+
+    public void setAverageIterations(double averageIterations) {
+        this.averageIterations = averageIterations;
+    }
+
+    public double getAverageIterations10() {
+        return averageIterations10;
+    }
+
+    public void setAverageIterations10(double averageIterations10) {
+        this.averageIterations10 = averageIterations10;
+    }
+
+    public double getAverageIterations20() {
+        return averageIterations20;
+    }
+
+    public void setAverageIterations20(double averageIterations20) {
+        this.averageIterations20 = averageIterations20;
+    }
+
+    public double getAverageIterations30() {
+        return averageIterations30;
+    }
+
+    public void setAverageIterations30(double averageIterations30) {
+        this.averageIterations30 = averageIterations30;
+    }
+}

game/src/test/java/research/AITest.java

@@ -0,0 +1,500 @@
+package research;
+
+
+import org.junit.jupiter.api.*;
+import org.toop.framework.game.games.reversi.BitboardReversi;
+import org.toop.framework.game.players.ArtificialPlayer;
+import org.toop.game.players.ai.MCTSAI;
+import org.toop.game.players.ai.mcts.MCTSAI1;
+import org.toop.game.players.ai.mcts.MCTSAI2;
+import org.toop.game.players.ai.mcts.MCTSAI3;
+import org.toop.game.players.ai.mcts.MCTSAI4;
+
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AITest {
+
+    private static List<Matchup> matchupList = new ArrayList<Matchup>();
+    private static List<AIData> dataList = new ArrayList<AIData>();
+    private static List<GameData> gameDataList = new ArrayList<GameData>();
+
+    @BeforeAll
+    public static void init() {
+
+        var versions = new ArtificialPlayer[4];
+		versions[0] = new ArtificialPlayer(new MCTSAI1(10), "MCTS V1");
+		versions[1] = new ArtificialPlayer(new MCTSAI2(10), "MCTS V2");
+		versions[2] = new ArtificialPlayer(new MCTSAI3(10), "MCTS V3");
+		versions[3] = new ArtificialPlayer(new MCTSAI4(10), "MCTS V4");
+        for (int i = 0; i < versions.length; i++) {
+            for (int j = i + 1; j < versions.length; j++) {
+                final int playerIndex1 = i % versions.length;
+                final int playerIndex2 = j % versions.length;
+                addMatch(versions[playerIndex1], versions[playerIndex2]);
+                addMatch(versions[playerIndex2], versions[playerIndex1]); // home vs away system
+            }
+        }
+    }
+
+    public static void addMatch(ArtificialPlayer v1, ArtificialPlayer v2) {
+        matchupList.add(new Matchup(v1, v2));
+    }
+
+    public void addAIData(AIData data) {
+        dataList.add(data);
+    }
+
+    public void addGameData(GameData data) {
+        gameDataList.add(data);
+    }
+
+    @Test
+    public void testAIvsAI() {
+        for (Matchup m : matchupList) {
+            for (int i = 0; i < 6; i++) {
+                playGame(m);
+            }
+        }
+    }
+
+    public void playGame(Matchup m) {
+        long millisecondscounterAI1 = 0L;
+        long millisecondscounterAI2 = 0L;
+        List<Integer> iterationsAI1 = new ArrayList<>();
+        List<Integer> iterationsAI2 = new ArrayList<>();
+        final BitboardReversi match = new BitboardReversi();
+        ArtificialPlayer[] players = new ArtificialPlayer[2];
+        players[0] = m.getPlayer1();
+        players[1] = m.getPlayer2();
+        match.init(players);
+        while (!match.isTerminal()) {
+            final int currentAI = match.getCurrentTurn();
+            final long startTime = System.nanoTime();
+            final long move = players[currentAI].getMove(match);
+            final long endTime = System.nanoTime();
+            if (players[currentAI].getAi() instanceof MCTSAI) {
+                final int lastIterations = ((MCTSAI) players[currentAI].getAi()).getLastIterations();
+                if (currentAI == 0) {
+                    iterationsAI1.add(lastIterations);
+                    millisecondscounterAI1 += (endTime - startTime);
+                } else {
+                    iterationsAI2.add(lastIterations);
+                    millisecondscounterAI2 += (endTime - startTime);
+                }
+            }
+            match.play(move);
+        }
+        generateMatchData(m.getPlayer1().getName(), m.getPlayer2().getName(), match, millisecondscounterAI1, millisecondscounterAI2);
+        generateData(m, match, iterationsAI1, iterationsAI2);
+    }
+
+    public void generateMatchData(String AI1, String AI2, BitboardReversi match, long millisecondscounterAI1, long millisecondscounterAI2) {
+        addGameData(new GameData(
+                AI1,
+                AI2,
+                getWinnerForMatch(AI1, AI2, match),
+				match.getAmountOfTurns(),
+                millisecondscounterAI1,
+                millisecondscounterAI2
+                ));
+    }
+
+    public String getWinnerForMatch(String AI1, String AI2, BitboardReversi match) {
+        if (match.getWinner() == 0) {
+            return AI1;
+        }
+        if (match.getWinner() == 1) {
+            return AI2;
+        } else {
+            return "TIE";
+        }
+    }
+
+    public void generateData(Matchup matchup, BitboardReversi match, List<Integer> iterationsAI1, List<Integer> iterationsAI2) {
+        boolean matchup1Found = false;
+        boolean matchup2Found = false;
+        for (AIData aiData : dataList) {
+            if (aiData.getAI().equals(matchup.getPlayer1().getName())) {
+                matchup1Found = true;
+            } if (aiData.getAI().equals(matchup.getPlayer2().getName())) {
+                matchup2Found = true;
+            }
+        }
+        if (!(matchup1Found)) {
+            addAIData(new AIData(matchup.getPlayer1().getName(), 0, 0, 0, 0, 0, 0));
+        }
+        if (!(matchup2Found)) {
+            addAIData(new AIData(matchup.getPlayer2().getName(), 0, 0, 0, 0, 0, 0));
+        }
+
+        for (AIData aiData : dataList) { // set data for player 1
+            if (aiData.getAI().equals(matchup.getPlayer1().getName())) {
+                aiData.setGamesPlayed(aiData.getGamesPlayed() + 1);
+                aiData.setWinrate(calculateWinrate(0, aiData.getWinrate(), aiData.getGamesPlayed(), match.getWinner()));
+                aiData.setAverageIterations(calculateAverageIterations(aiData.getAverageIterations(), iterationsAI1));
+                aiData.setAverageIterations10(calculateAverageIterationsStartEnd(0, 10, aiData.getAverageIterations10(), iterationsAI1));
+                aiData.setAverageIterations20(calculateAverageIterationsStartEnd(10, 20, aiData.getAverageIterations20(), iterationsAI1));
+                aiData.setAverageIterations30(calculateAverageIterationsStartEnd(20, iterationsAI1.size(), aiData.getAverageIterations30(), iterationsAI1));
+            }
+        }
+
+        for (AIData aiData : dataList) {
+            if (aiData.getAI().equals(matchup.getPlayer2().getName())) {
+                aiData.setGamesPlayed(aiData.getGamesPlayed() + 1);
+                aiData.setWinrate(calculateWinrate(1, aiData.getWinrate(), aiData.getGamesPlayed(), match.getWinner()));
+                aiData.setAverageIterations(calculateAverageIterations(aiData.getAverageIterations(), iterationsAI2));
+                aiData.setAverageIterations10(calculateAverageIterationsStartEnd(0, 10, aiData.getAverageIterations10(), iterationsAI2));
+                aiData.setAverageIterations20(calculateAverageIterationsStartEnd(10, 20, aiData.getAverageIterations20(), iterationsAI2));
+                aiData.setAverageIterations30(calculateAverageIterationsStartEnd(20, iterationsAI2.size(), aiData.getAverageIterations30(), iterationsAI2));
+            }
+        }
+    }
+
+    public double calculateWinrate(int player, double winrate, long gamesPlayed, int winner) {
+        double result;
+        if (winner == 0 && player == 0 || winner == 1 && player == 1) {
+            return (winrate * (gamesPlayed - 1) + 1) / gamesPlayed;
+        } else if (winner == 0 && player == 1 || winner == 1 && player == 0) {
+            return (winrate * (gamesPlayed - 1) + 0) / gamesPlayed;
+        }
+        return (winrate * (gamesPlayed - 1) + 0) / gamesPlayed;
+    }
+
+    public double calculateAverageIterations(double averageIterations, List<Integer> thisGameIterations) {
+        double thisGameIterationsAverage = 0;
+        for (int iterations = 0; iterations < thisGameIterations.size(); iterations += 1) {
+            thisGameIterationsAverage += thisGameIterations.get(iterations);
+        }
+        thisGameIterationsAverage /= thisGameIterations.size();
+        return (averageIterations + thisGameIterationsAverage) / 2;
+    }
+
+    public double calculateAverageIterationsStartEnd(int start, int end, double averageIterations, List<Integer> thisGameIterations) {
+        double thisGameIterationsAverage = 0;
+        for (int iterations = start; iterations < end; iterations += 1) {
+            thisGameIterationsAverage += thisGameIterations.get(iterations);
+        }
+        thisGameIterationsAverage /= (end - start);
+        return (averageIterations + thisGameIterationsAverage) / 2;
+    }
+
+    @AfterAll
+    public static void writeAfterTests() {
+        try {
+            writeAIToCsv("Data.csv", dataList);
+            writeGamesToCSV("Games.csv", gameDataList);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void writeGamesToCSV(String filepath, List<GameData> gameDataList) throws IOException {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath))) {
+            writer.write("Black,White,Winner,Turns Played,Total Time AI1, Total Time AI2");
+            writer.newLine();
+            for (GameData gameData : gameDataList) {
+                writer.write(
+                        gameData.AI1() + "," +
+                        gameData.AI2() + "," +
+                        gameData.winner() + "," +
+                        gameData.turns() + "," +
+                        (gameData.millisecondsAI1() / 1_000_000L) + "," +
+                        (gameData.millisecondsAI2() / 1_000_000L));
+                writer.newLine();
+            }
+        }
+    }
+
+    public static void writeAIToCsv(String filepath, List<AIData> dataList) throws IOException {
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath))) {
+            writer.write("AI Name,Games Played,Winrate,Average Iterations,Average Iterations 0-10, Average Iterations 11-20, Average Iterations 20-30");
+            writer.newLine();
+            for (AIData data : dataList) {
+                writer.write(
+                        data.getAI() + "," +
+                            data.getGamesPlayed() + "," +
+                            data.getWinrate() + "," +
+                            Math.round(data.getAverageIterations()) + "," +
+                            Math.round(data.getAverageIterations10()) + "," +
+                            Math.round(data.getAverageIterations20()) + "," +
+                            Math.round(data.getAverageIterations30()));
+                writer.newLine();
+            }
+        }
+    }
+}
+
+//public class AITest {
+
+//    private static int games = 2;
+//
+//    @BeforeAll
+//    public static void setUp() {
+//        var versions = new ArtificialPlayer[5];
+//        versions[0] = new ArtificialPlayer(new RandomAI(), "Random AI");
+//        versions[1] = new ArtificialPlayer(new MCTSAI1(20), "MCTS V1 AI");
+//        versions[2] = new ArtificialPlayer(new org.toop.game.players.ai.mcts.MCTSAI2(20), "MCTS V2 AI");
+//        versions[3] = new ArtificialPlayer(new org.toop.game.players.ai.mcts.MCTSAI3(20, 10), "MCTS V3 AI");
+//        versions[4] = new ArtificialPlayer(new MCTSAI4(20, 10), "MCTS V4 AI");
+//
+//        for (int i = 0; i < versions.length; i++) {
+//            for (int j = i + 1; j < versions.length; j++) {
+//                final int playerIndex1 = i % versions.length;
+//                final int playerIndex2 = j % versions.length;
+//                addMatchup(versions[playerIndex1], versions[playerIndex2]);
+//            }
+//        }
+//
+//    }
+//
+//    @BeforeEach
+//    public void setUpEach() {
+//        matchupList = new ArrayList<>();
+//    }
+//
+//    @Test
+//    public void testIterationsInRealGame() {
+//        for (int i = 0; i < matchups.size(); i++) {
+//            testAIVSAI(games, getMatchup(i));
+//        }
+//    }
+//
+//
+//    private void testAIVSAI(int games, ArtificialPlayer[] ais) {
+//
+//        List<List<Integer>> gamesList = new ArrayList<>();
+//        for (int i = 0; i < games; i++) {
+//            final BitboardReversi match = new BitboardReversi();
+//            match.init(ais);
+//
+//            List<Integer> iterations1 = new ArrayList<>();
+//            List<Integer> iterations2 = new ArrayList<>();
+//
+//            while (!match.isTerminal()) {
+//                final int currentAI = match.getCurrentTurn();
+//                final long move = ais[currentAI].getMove(match);
+//                if (ais[currentAI].getAi() instanceof MCTSAI) {
+//                    final int lastIterations = ((MCTSAI) ais[currentAI].getAi()).getLastIterations();
+//                    if (currentAI == 0) {
+//                        iterations1.add(lastIterations);
+//                    } else if (currentAI == 1) {
+//                        iterations2.add(lastIterations);
+//                    }
+//                }
+//                match.play(move);
+//            }
+//            int winner = match.getWinner();
+//            iterations1.addFirst(winner);
+////            iterations1.add(-999);
+//            iterations1.addAll(iterations2);
+//
+//            gamesList.add(iterations1);
+//        }
+//        matchupList.add(gamesList);
+//    }
+//
+//    @Test
+//    public void testIterationsAtFixedMove() {
+//        for (ArtificialPlayer[] matchup : matchups) {
+//            List<List<Integer>> gamesList = new ArrayList<>();
+//            for (int j = 0; j < games; j++) {
+//                final BitboardReversi match = new BitboardReversi();
+//                match.init(matchup);
+//
+//                List<Integer> iterations = new ArrayList<>();
+//
+//                for (Long move : fixedMoveSet) {
+//                    match.play(move);
+//                    if (move == 32L) {
+//                        break;
+//                    }
+//                }
+////                iterations.add(-999);
+//                var player = matchup[match.getCurrentTurn()];
+//                for (int k = 0; k < 10; k++) {
+//                    player.getMove(match);
+//                    if (player.getAi() instanceof MCTSAI) {
+//                        iterations.add(((MCTSAI) player.getAi()).getLastIterations());
+//                    }
+//                }
+//                gamesList.add(iterations);
+//            }
+//            matchupList.add(gamesList);
+//        }
+//    }
+//
+//
+//    @Test
+//    public void testIterationsInFixedGame() {
+//        for (ArtificialPlayer[] matchup : matchups) {
+//            List<List<Integer>> gamesList = new ArrayList<>();
+//            for (int j = 0; j < games; j++) {
+//                final BitboardReversi match = new BitboardReversi();
+//                match.init(matchup);
+//
+//                List<Integer> iterations = new ArrayList<>();
+//
+//                iterations.add(-999);
+//
+//                for (Long move : fixedMoveSet) {
+//                    var player = matchup[match.getCurrentTurn()];
+//                    player.getMove(match);
+//                    if (player.getAi() instanceof MCTSAI) {
+//                        iterations.add(((MCTSAI) player.getAi()).getLastIterations());
+//                    }
+//                    match.play(move);
+//                }
+//
+//                gamesList.add(iterations);
+//            }
+//            matchupList.add(gamesList);
+//        }
+//    }
+//
+//    @AfterEach
+//    public void tearDown() {
+//        data.add(matchupList);
+//    }
+//
+//    @AfterAll
+//    public static void writeAfterTests() {
+//        try {
+//            writeToCsv("Data.csv", data);
+//        } catch (IOException e) {
+//
+//        }
+//    }
+//
+//
+//    public static void writeToCsv(String filepath, List<List<List<List<Integer>>>> data) throws IOException {
+//        try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath))) {
+//
+//            writer.write("TestID,Matchup,GameNr,Winner");
+//            for (int i = 0; i < data.size(); i++) {
+//                writer.write(",Iterations");
+//            }
+//
+//            writer.newLine();
+//
+//            for (int TestID = 0; TestID < data.size(); TestID++) {
+//                List<List<List<Integer>>> testCase = data.get(TestID);
+//
+//                for (int matchupNr = 0; matchupNr < testCase.size(); matchupNr++) {
+//                    List<List<Integer>> matchup = testCase.get(matchupNr);
+//
+//                    for (int gameNr = 0; gameNr < matchup.size(); gameNr++) {
+//                        List<Integer> game = matchup.get(gameNr);
+//                        writer.write((TestID + 1) + "," + (getMatchupName(matchupNr)) + "," + (gameNr + 1));
+//                        for (int i = 0; i < game.size(); i++) {
+//                            if (i == 0) {
+//                                writer.write("," + getWinnerFromMatchup(game.get(i), matchupNr));
+//                            } else {
+//                                writer.write("," + game.get(i));
+//                            }
+//                        }
+//                        writer.newLine();
+//                    }
+//                }
+//            }
+//        }
+//
+//    }
+//
+//
+//    private static final List<List<List<List<Integer>>>> data = new ArrayList<>();
+//    private List<List<List<Integer>>> matchupList = new ArrayList<>();
+//    private static final List<String> matchupNames = new ArrayList<>();
+//    private static final List<ArtificialPlayer[]> matchups = new ArrayList<>();
+//
+//    private static String getMatchupName(int matchupNr) {
+//        return matchupNames.get(matchupNr);
+//    }
+//
+//    private static ArtificialPlayer[] getMatchup(int matchupNr) {
+//        return matchups.get(matchupNr);
+//    }
+//
+//    private static String getWinnerFromMatchup(Integer winner, int matchupNr) {
+//        String matchup = matchupNames.get(matchupNr);
+//
+//        String[] parts = matchup.split(" vs ");
+//
+//        if (parts.length != 2) {
+//            return "Invalid matchup formatting.";
+//        }
+//
+//        return winner == 0 ? parts[0] : winner == 1 ? parts[1] : winner == -999 ? "NVT" : "Tie";
+//    }
+//
+//    private static void addMatchup(ArtificialPlayer player1, ArtificialPlayer player2) {
+//        matchups.add(new ArtificialPlayer[]{player1, player2});
+//        matchupNames.add(player1.getName() + " vs " + player2.getName());
+//    }
+//}
+
+//    private final Long[] fixedMoveSet = new Long[]{17592186044416L,
+//            35184372088832L,
+//            67108864L,
+//            8796093022208L,
+//            2251799813685248L,
+//            288230376151711744L,
+//            70368744177664L,
+//            1125899906842624L,
+//            137438953472L,
+//            140737488355328L,
+//            4503599627370496L,
+//            2305843009213693952L,
+//            18014398509481984L,
+//            274877906944L,
+//            576460752303423488L,
+//            -9223372036854775808L,
+//            549755813888L,
+//            1152921504606846976L,
+//            144115188075855872L,
+//            72057594037927936L,
+//            36028797018963968L,
+//            17179869184L,
+//            2199023255552L,
+//            1048576L,
+//            4398046511104L,
+//            281474976710656L,
+//            9007199254740992L,
+//            2147483648L,
+//            1073741824L,
+//            33554432L,
+//            262144L,
+//            8388608L,
+//            8192L,
+//            4611686018427387904L,
+//            4294967296L,
+//            524288L,
+//            4096L,
+//            16777216L,
+//            65536L,
+//            32L,
+//            2048L,
+//            8L,
+//            4L,
+//            8589934592L,
+//            16L,
+//            2097152L,
+//            4194304L,
+//            1024L,
+//            512L,
+//            16384L,
+//            536870912L,
+//            1099511627776L,
+//            64L,
+//            562949953421312L,
+//            128L,
+//            1L,
+//            32768L,
+//            2L,
+//            256L,
+//            131072L};
+// }
+

game/src/test/java/research/GameData.java

@@ -0,0 +1,4 @@
+package research;
+
+public record GameData(String AI1, String AI2, String winner, int turns, long millisecondsAI1, long millisecondsAI2) {}
+

game/src/test/java/research/Matchup.java

@@ -0,0 +1,30 @@
+package research;
+
+import org.toop.framework.game.players.ArtificialPlayer;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Matchup {
+    public ArtificialPlayer player1;
+    public ArtificialPlayer player2;
+
+    public Matchup(ArtificialPlayer player1, ArtificialPlayer player2) {
+        this.player1 = player1;
+        this.player2 = player2;
+    }
+
+    public Matchup() {}
+
+    public String toString() {
+        return player1.toString() + " VS " + player2.toString();
+    }
+
+    public ArtificialPlayer getPlayer1() {
+        return player1;
+    }
+
+    public ArtificialPlayer getPlayer2() {
+        return player2;
+    }
+}