diff options
Diffstat (limited to 'src/jrummikub/model/Hand.java')
-rw-r--r-- | src/jrummikub/model/Hand.java | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/jrummikub/model/Hand.java b/src/jrummikub/model/Hand.java index 344855d..b6d9eb4 100644 --- a/src/jrummikub/model/Hand.java +++ b/src/jrummikub/model/Hand.java @@ -18,18 +18,6 @@ public class Hand extends StoneTray<Stone> implements IHand { */ public final static int WIDTH = 14; - private GameSettings settings; - - /** - * Create a new empty hand with given game settings - * - * @param settings - * the game settings - */ - public Hand(GameSettings settings) { - this.settings = settings; - } - @Override public int getFreeRowSpace(int row) { int count = 0; @@ -74,7 +62,8 @@ public class Hand extends StoneTray<Stone> implements IHand { } } - public int getStonePoints() { + @Override + public int getStonePoints(GameSettings settings) { int points = 0; for (Pair<Stone, Position> entry : this) { @@ -89,7 +78,9 @@ public class Hand extends StoneTray<Stone> implements IHand { } @Override - public boolean isInitialMeldPossible() { + public boolean isInitialMeldPossible(GameSettings settings) { + AIUtil aiUtil = new AIUtil(settings); + List<Stone> stones = new ArrayList<Stone>(); for (Iterator<Pair<Stone, Position>> iter = this.iterator(); iter.hasNext();) { @@ -99,11 +90,9 @@ public class Hand extends StoneTray<Stone> implements IHand { Pair<TreeMap<Pair<Integer, StoneColor>, Integer>, Integer> stoneCounts = AIUtil .countStones(stones); - Pair<List<StoneSet>, Integer> result = AIUtil.findSetsWithTotalPoints( + Pair<List<StoneSet>, Integer> result = aiUtil.findSetsWithTotalPoints( settings.getInitialMeldThreshold(), stoneCounts.getFirst(), stoneCounts.getSecond()); - - System.out.println(result); return (result.getSecond() >= settings.getInitialMeldThreshold()); } |