updated repo for Ludii 0.4.1

Author: DennisSoemers

README.md

@@ -142,6 +142,7 @@ Alternatively, the following email address may be used: `ludii(dot)games(at)gmai
 
 ## Changelog
 
+- 27 November, 2019: Updated repository for compatibility with new version 0.4.1 of Ludii.
 - 6 September, 2019: Updated repository for compatibility with new version 0.3.0 of Ludii.
 - 13 August, 2019: Initial release.
 

src/experiments/RunCustomMatch.java

@@ -4,20 +4,20 @@
 import java.util.List;
 
 import game.Game;
-import game.mode.model.Model;
 import player.GameLoader;
 import random.RandomAI;
 import search.mcts.MCTS;
 import util.AI;
 import util.Context;
 import util.Trial;
+import util.model.Model;
 
 /**
  * An example of a custom implementation of a match between different AIs,
  * i.e. not using the built-in Match functionality of Ludii.
  * 
  * By creating custom implementations of matches/experiments, we can more
- * easily add our own custom stats to track, and request mvoes from AIs
+ * easily add our own custom stats to track, and request moves from AIs
  * that do not implement Ludii's abstract AI class. The downside is that
  * more boilerplate code must be written.
  * 

src/experiments/Tutorial.java

@@ -5,7 +5,6 @@
 import java.util.List;
 
 import game.Game;
-import game.mode.model.Model;
 import main.FastArrayList;
 import mcts.ExampleUCT;
 import player.GameLoader;
@@ -14,7 +13,8 @@
 import util.Context;
 import util.Move;
 import util.Trial;
-import util.state.StateType;
+import util.model.Model;
+import util.state.GameType;
 import util.state.containerState.ContainerState;
 
 /**
@@ -42,14 +42,14 @@ public static void main(final String[] args)
 		final int stateFlags = game.stateFlags();
 
 		// for example, we may like to know whether our game has stochastic elements
-		final boolean isStochastic = ((stateFlags & StateType.Stochastic) != 0);
+		final boolean isStochastic = ((stateFlags & GameType.Stochastic) != 0);
 		if (isStochastic)
 			System.out.println(game.name() + " is stochastic.");
 		else
 			System.out.println(game.name() + " is not stochastic.");
 
 		// figure out how many players are expected to play this game
-		final int numPlayers = game.mode().numPlayers();
+		final int numPlayers = game.players().count();
 		System.out.println(game.name() + " is a " + numPlayers + "-player game.");
 
 		// to be able to play the game, we need to instantiate "Trial" and "Context" objects
@@ -66,7 +66,7 @@ public static void main(final String[] args)
 			// for every container state we find (often just 1), we'll print a few things:
 
 			// print the collection of locations that are empty
-			System.out.println("Empty locations = " + containerState.empty().bitSet());
+			System.out.println("Empty locations = " + containerState.emptyChunkSet());
 
 			// for every location that is owned by a player, print the owner
 			System.out.println("Who = " + containerState.cloneWho().toChunkString());
@@ -88,7 +88,7 @@ public static void main(final String[] args)
 		// let's print our empty/who/what again, see how they have changed
 		for (final ContainerState containerState : trial.state().containerStates())
 		{
-			System.out.println("Empty locations = " + containerState.empty().bitSet());
+			System.out.println("Empty locations = " + containerState.emptyChunkSet());
 			System.out.println("Who = " + containerState.cloneWho().toChunkString());
 			System.out.println("What = " + containerState.cloneWhat().toChunkString());
 		}
@@ -102,7 +102,7 @@ public static void main(final String[] args)
 		// let's have a final look at how our state looks after this second move
 		for (final ContainerState containerState : trial.state().containerStates())
 		{
-			System.out.println("Empty locations = " + containerState.empty().bitSet());
+			System.out.println("Empty locations = " + containerState.emptyChunkSet());
 			System.out.println("Who = " + containerState.cloneWho().toChunkString());
 			System.out.println("What = " + containerState.cloneWhat().toChunkString());
 		}

src/mcts/ExampleDUCT.java

@@ -124,7 +124,7 @@ public ExampleDUCT()
 				if (current.totalVisitCount > 0)
 				{
 					// This node was not newly expanded in this iteration
-					for (int p = 1; p <= game.mode().numPlayers(); ++p)
+					for (int p = 1; p <= game.players().count(); ++p)
 					{
 						current.visitCounts[p][current.lastSelectedMovesPerPlayer[p]] += 1;
 						current.scoreSums[p][current.lastSelectedMovesPerPlayer[p]] += utilities[p];
@@ -156,7 +156,7 @@ public static Node select(final Node current)
 		// Every player selects its move based on its own, decoupled statistics
 		final List<Action> playerMoves = new ArrayList<Action>();
 		final Game game = current.context.game();
-		final int numPlayers = game.mode().numPlayers();
+		final int numPlayers = game.players().count();
 
 		for (int p = 1; p <= numPlayers; ++p)
 		{
@@ -331,7 +331,7 @@ public Node(final Node parent, final Context context)
 			this.parent = parent;
 			this.context = context;
 			final Game game = context.game();
-			final int numPlayers = game.mode().numPlayers();
+			final int numPlayers = game.players().count();
 
 			final FastArrayList<Move> allLegalMoves = game.moves(context).moves();
 

src/mcts/ExampleUCT.java

@@ -114,7 +114,7 @@ public ExampleUCT()
 			while (current != null)
 			{
 				current.visitCount += 1;
-				for (int p = 1; p <= game.mode().numPlayers(); ++p)
+				for (int p = 1; p <= game.players().count(); ++p)
 				{
 					current.scoreSums[p] += utilities[p];
 				}
@@ -294,7 +294,7 @@ public Node(final Node parent, final Move moveFromParent, final Context context)
 			this.moveFromParent = moveFromParent;
 			this.context = context;
 			final Game game = context.game();
-			scoreSums = new double[game.mode().numPlayers() + 1];
+			scoreSums = new double[game.players().count() + 1];
 
 			// For simplicity, we just take ALL legal moves. 
 			// This means we do not support simultaneous-move games.

src/random/RandomAI.java

@@ -8,7 +8,7 @@
 import util.Context;
 import util.Move;
 import util.action.ActionPass;
-import util.state.StateType;
+import util.state.GameType;
 import utils.AIUtils;
 
 /**
@@ -57,7 +57,7 @@ public RandomAI()
 
 		// If we're playing a simultaneous-move game, some of the legal moves may be 
 		// for different players. Extract only the ones that we can choose.
-		if ((game.stateFlags() & StateType.Simultaneous) != 0)
+		if ((game.stateFlags() & GameType.Simultaneous) != 0)
 			legalMoves = AIUtils.extractMovesForMover(legalMoves, player);
 
 		final int r = ThreadLocalRandom.current().nextInt(legalMoves.size());