Jaipur Skeleton

Author: rdgain

src/main/java/core/AbstractGameState.java

@@ -14,6 +14,8 @@
 import utilities.ElapsedCpuChessTimer;
 
 import java.util.*;
+import java.util.function.BiFunction;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 import static java.util.stream.Collectors.toList;
@@ -392,7 +394,14 @@ public final Stack<IExtendedSequence> getActionsInProgress() {
      * @param playerId
      * @return
      */
-    public double getTiebreak(int playerId) {
+    public Double getTiebreak(int playerId) {
+        return getTiebreak(playerId, 1);
+    }
+
+    /**
+     * @param tier - if multiple tiebreaks available in the game, this parameter can be used to specify what each one does, applied in the order 1,2,3 ...
+     */
+    public Double getTiebreak(int playerId, int tier) {
         return 0.0;
     }
 
@@ -406,21 +415,39 @@ public double getTiebreak(int playerId) {
      * @param playerId player ID
      * @return The ordinal position of the player; 1 is 1st, 2 is 2nd and so on.
      */
-    public int getOrdinalPosition(int playerId) {
-        double playerScore = getGameScore(playerId);
+    public int getOrdinalPosition(int playerId, Function<Integer, Double> scoreFunction, BiFunction<Integer, Integer, Double> tiebreakFunction) {
         int ordinal = 1;
+        double playerScore = scoreFunction.apply(playerId);
         for (int i = 0, n = getNPlayers(); i < n; i++) {
-            double otherScore = getGameScore(i);
+            double otherScore = scoreFunction.apply(i);
             if (otherScore > playerScore)
                 ordinal++;
-            else if (otherScore == playerScore) {
-                if (getTiebreak(i) > getTiebreak(playerId))
+            else if (otherScore == playerScore && tiebreakFunction != null) {
+                if (getOrdinalPositionTiebreak(i, tiebreakFunction, 1) > getOrdinalPositionTiebreak(playerId, tiebreakFunction, 1))
                     ordinal++;
             }
         }
         return ordinal;
     }
+    public int getOrdinalPositionTiebreak(int playerId, BiFunction<Integer, Integer, Double> tiebreakFunction, int tier) {
+        int ordinal = 1;
+        Double playerScore = tiebreakFunction.apply(playerId, tier);
+        if (playerScore == null) return ordinal;
 
+        for (int i = 0, n = getNPlayers(); i < n; i++) {
+            double otherScore = tiebreakFunction.apply(i, tier);
+            if (otherScore > playerScore)
+                ordinal++;
+            else if (otherScore == playerScore) {
+                if (getOrdinalPositionTiebreak(i, tiebreakFunction, tier+1) > getOrdinalPositionTiebreak(playerId, tiebreakFunction, tier+1))
+                    ordinal++;
+            }
+        }
+        return ordinal;
+    }
+    public int getOrdinalPosition(int playerId) {
+        return getOrdinalPosition(playerId, this::getGameScore, this::getTiebreak);
+    }
 
     /**
      * Provide a list of component IDs which are hidden in partially observable copies of games.

src/main/java/core/Game.java

@@ -4,8 +4,8 @@
 import core.actions.DoNothing;
 import core.interfaces.IPrintable;
 import core.turnorders.ReactiveTurnOrder;
-import evaluation.listeners.GameListener;
 import evaluation.metrics.Event;
+import evaluation.listeners.GameListener;
 import evaluation.summarisers.TAGNumericStatSummary;
 import games.GameType;
 import gui.AbstractGUIManager;
@@ -30,8 +30,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
-
-import evaluation.metrics.*;
 import static utilities.Utils.componentToImage;
 
 public class Game {
@@ -901,8 +899,6 @@ private void terminateVideoRecording() {
         }
     }
 
-
-
     /**
      * The recommended way to run a game is via evaluations.Frontend, however that may not work on
      * some games for some screen sizes due to the vagaries of Java Swing...
@@ -916,19 +912,16 @@ private void terminateVideoRecording() {
      * and then run this class.
      */
     public static void main(String[] args) {
-        String gameType = Utils.getArg(args, "game", "GameTemplate");
+        String gameType = Utils.getArg(args, "game", "Jaipur");
         boolean useGUI = Utils.getArg(args, "gui", true);
-        int playerCount = Utils.getArg(args, "nPlayers", 2);
         int turnPause = Utils.getArg(args, "turnPause", 0);
         long seed = Utils.getArg(args, "seed", System.currentTimeMillis());
+        ActionController ac = new ActionController();
 
-        ActionController ac = new ActionController(); //null;
-
-        /* Set up players for the game */
-        ArrayList<AbstractPlayer> players = new ArrayList<>(playerCount);
-
-        players.add(new RandomPlayer());
+        // 1. Set up the players for the game.
+        ArrayList<AbstractPlayer> players = new ArrayList<>();
 //        players.add(new RandomPlayer());
+        players.add(new RandomPlayer());
 //        players.add(new MCTSPlayer());
 //        MCTSParams params1 = new MCTSParams();
 //        players.add(new MCTSPlayer(params1));
@@ -937,14 +930,14 @@ public static void main(String[] args) {
         players.add(new HumanGUIPlayer(ac));
 //        players.add(new HumanConsolePlayer());
 //        players.add(new FirstActionPlayer());
-//        players.add(new HumanConsolePlayer());
 
-        /* 4. Game parameter configuration. Set to null to ignore and use default parameters */
+        // 2. Game parameter configuration. Set to null to ignore and use default parameters
         String gameParams = null;
 
-        /* 5. Run! */
+        // 3. Run!
         runOne(GameType.valueOf(gameType), gameParams, players, seed, false, null, useGUI ? ac : null, turnPause);
 
+        // 4. Run several games
 //        ArrayList<GameType> games = new ArrayList<>(Arrays.asList(GameType.values()));
 //        games.remove(LoveLetter);
 //        games.remove(Pandemic);

src/main/java/core/components/Counter.java

@@ -9,7 +9,9 @@
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 public class Counter extends Component {
     protected int[] values;
@@ -57,16 +59,22 @@ public boolean increment(int amount) {
         this.valueIdx += amount;
         return clamp();
     }
+    public boolean increment() {
+        return increment(1);
+    }
 
-    /**
-     * Decrement the value of this counter.
-     * @param amount - how much to decrease this counter by.
-     * @return - true if succeeded, false if capped at min
-     */
+        /**
+         * Decrement the value of this counter.
+         * @param amount - how much to decrease this counter by.
+         * @return - true if succeeded, false if capped at min
+         */
     public boolean decrement(int amount) {
         this.valueIdx -= amount;
         return clamp();
     }
+    public boolean decrement() {
+        return decrement(1);
+    }
 
     private boolean clamp() {
         if (this.valueIdx > this.maximum) {
@@ -201,8 +209,24 @@ public void loadCounter(JSONObject counter) {
         parseComponent(this, counter);
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Counter)) return false;
+        if (!super.equals(o)) return false;
+        Counter counter = (Counter) o;
+        return valueIdx == counter.valueIdx && minimum == counter.minimum && maximum == counter.maximum && Arrays.equals(values, counter.values);
+    }
+
     @Override
     public int hashCode() {
-        return componentID;
+        int result = Objects.hash(super.hashCode(), valueIdx, minimum, maximum);
+        result = 31 * result + Arrays.hashCode(values);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "" + getValue();
     }
 }

src/main/java/games/GameType.java

@@ -19,6 +19,7 @@
 import games.dotsboxes.*;
 import games.explodingkittens.*;
 import games.explodingkittens.gui.ExplodingKittensGUIManager;
+import games.jaipurskeleton.*;
 import games.loveletter.*;
 import games.loveletter.gui.LoveLetterGUIManager;
 import games.pandemic.*;
@@ -165,7 +166,9 @@ public enum GameType {
             Arrays.asList(Dice, Abstract),
             Collections.singletonList(PushYourLuck),
             CantStopGameState.class, CantStopForwardModel.class, CantStopParameters.class, CantStopGUIManager.class
-    );
+    ),
+    Jaipur(2,2, null, null,
+            JaipurGameState.class, JaipurForwardModel.class, JaipurParameters.class, JaipurGUIManager.class);
 
     // Core classes where the game is defined
     final Class<? extends AbstractGameState> gameStateClass;

src/main/java/games/coltexpress/ColtExpressGameState.java

@@ -238,7 +238,7 @@ public double getGameScore(int playerId) {
     }
 
     @Override
-    public double getTiebreak(int playerId) {
+    public Double getTiebreak(int playerId) {
         // we use the number of bullet cards
         // in the players own deck and hands
         // fewer is better - so we return a negative number
@@ -249,7 +249,7 @@ public double getTiebreak(int playerId) {
         for (ColtExpressCard card : playerHandCards.get(playerId).getComponents())
             if (card.cardType == ColtExpressCard.CardType.Bullet)
                 bulletsTaken++;
-        return -bulletsTaken;
+        return (double) -bulletsTaken;
     }
 
     @Override