xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-12-12 17:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Removed move cache from MoveGen.

Browse Source 
This cache was not thread safe and was not used much anyway. (Leftover
from CuckooChess move generator.)
This commit is contained in:
Peter Osterlund
2017-05-26 00:41:04 +02:00
parent 1ce7d2298e
commit e065656b6c
1 changed files with 5 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
DroidFish/src/org/petero/droidfish/gamelogic/MoveGen.java
View File

@@ -39,7 +39,7 @@ public class MoveGen {
* Pseudo-legal means that the moves don't necessarily defend from check threats. * Pseudo-legal means that the moves don't necessarily defend from check threats.
*/ */
public final ArrayList<Move> pseudoLegalMoves(Position pos) { public final ArrayList<Move> pseudoLegalMoves(Position pos) {
ArrayList<Move> moveList = getMoveListObj(); ArrayList<Move> moveList = new ArrayList<Move>(60);
final boolean wtm = pos.whiteMove; final boolean wtm = pos.whiteMove;
for (int x = 0; x < 8; x++) { for (int x = 0; x < 8; x++) {
for (int y = 0; y < 8; y++) { for (int y = 0; y < 8; y++) {
@@ -119,8 +119,7 @@ public class MoveGen {
if (cap != Piece.EMPTY) { if (cap != Piece.EMPTY) {
if (Piece.isWhite(cap) != wtm) { if (Piece.isWhite(cap) != wtm) {
if (cap == (wtm ? Piece.BKING : Piece.WKING)) { if (cap == (wtm ? Piece.BKING : Piece.WKING)) {
returnMoveList(moveList); moveList.clear();
moveList = getMoveListObj();
moveList.add(getMoveObj(sq, toSq, Piece.EMPTY)); moveList.add(getMoveObj(sq, toSq, Piece.EMPTY));
return moveList; return moveList;
} else { } else {
@@ -137,8 +136,7 @@ public class MoveGen {
if (cap != Piece.EMPTY) { if (cap != Piece.EMPTY) {
if (Piece.isWhite(cap) != wtm) { if (Piece.isWhite(cap) != wtm) {
if (cap == (wtm ? Piece.BKING : Piece.WKING)) { if (cap == (wtm ? Piece.BKING : Piece.WKING)) {
returnMoveList(moveList); moveList.clear();
moveList = getMoveListObj();
moveList.add(getMoveObj(sq, toSq, Piece.EMPTY)); moveList.add(getMoveObj(sq, toSq, Piece.EMPTY));
return moveList; return moveList;
} else { } else {
@@ -258,8 +256,7 @@ public class MoveGen {
} else { } else {
if (Piece.isWhite(p) != wtm) { if (Piece.isWhite(p) != wtm) {
if (p == oKing) { if (p == oKing) {
returnMoveList(moveList); moveList.clear();
moveList = getMoveListObj(); // Ugly! this only works because we get back the same object
moveList.add(getMoveObj(sq0, sq, Piece.EMPTY)); moveList.add(getMoveObj(sq0, sq, Piece.EMPTY));
return true; return true;
} else { } else {
@@ -310,49 +307,7 @@ public class MoveGen {
return Piece.EMPTY; return Piece.EMPTY;
} }
// Code to handle the Move cache. private static final Move getMoveObj(int from, int to, int promoteTo) {
private Move[] moveCache = new Move[2048];
private int movesInCache = 0;
private Object[] moveListCache = new Object[200];
private int moveListsInCache = 0;
private final Move getMoveObj(int from, int to, int promoteTo) {
if (movesInCache > 0) {
Move m = moveCache[--movesInCache];
m.from = from;
m.to = to;
m.promoteTo = promoteTo;
return m;
}
return new Move(from, to, promoteTo); return new Move(from, to, promoteTo);
} }
@SuppressWarnings("unchecked")
private final ArrayList<Move> getMoveListObj() {
if (moveListsInCache > 0) {
return (ArrayList<Move>)moveListCache[--moveListsInCache];
}
return new ArrayList<Move>(60);
}
/** Return all move objects in moveList to the move cache. */
public final void returnMoveList(ArrayList<Move> moveList) {
if (movesInCache + moveList.size() <= moveCache.length) {
int mlSize = moveList.size();
for (int mi = 0; mi < mlSize; mi++) {
moveCache[movesInCache++] = moveList.get(mi);
}
}
moveList.clear();
if (moveListsInCache < moveListCache.length) {
moveListCache[moveListsInCache++] = moveList;
}
}
public final void returnMove(Move m) {
if (movesInCache < moveCache.length) {
moveCache[movesInCache++] = m;
}
}
} }