xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-23 11:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some Android Studio warnings.

Browse Source
This commit is contained in:
Peter Osterlund 2019-03-30 15:44:35 +01:00
parent 8a0a495830
commit 78b4ac2762
77 changed files with 324 additions and 664 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CuckooChess/src/main/java/gui/AppletGUI.java
View File

@ -31,8 +31,8 @@ import chess.Position;
/** The main class for the chess GUI. */
public class AppletGUI extends javax.swing.JApplet implements GUIInterface {
private static final long serialVersionUID = 7357610346389734323L;
ChessBoardPainter cbp;
ChessController ctrl;
private ChessBoardPainter cbp;
private ChessController ctrl;
private final static int ttLogSize = 19; // Use 2^19 hash entries.
private String moveListStr = "";
private String thinkingStr = "";

8
CuckooChess/src/main/java/gui/ChessBoardPainter.java
View File

@ -61,7 +61,6 @@ public class ChessBoardPainter extends JLabel {
/**
* Set the board to a given state.
* @param pos
*/
final public void setPosition(Position pos) {
this.pos = pos;
@ -70,7 +69,6 @@ public class ChessBoardPainter extends JLabel {
/**
* Set/clear the board flipped status.
* @param flipped
*/
final public void setFlipped(boolean flipped) {
this.flipped = flipped;
@ -227,23 +225,23 @@ public class ChessBoardPainter extends JLabel {
}
final Move mousePressed(int sq) {
Move m = null;
cancelSelection = false;
int p = pos.getPiece(sq);
if ((selectedSquare >= 0) && (sq == selectedSquare)) {
int fromPiece = pos.getPiece(selectedSquare);
if ((fromPiece == Piece.EMPTY) || (Piece.isWhite(fromPiece) != pos.whiteMove)) {
return m; // Can't move the piece the oppenent just moved.
return null; // Can't move the piece the opponent just moved.
}
}
if ((selectedSquare < 0) &&
((p == Piece.EMPTY) || (Piece.isWhite(p) != pos.whiteMove))) {
return m; // You must click on one of your own pieces.
return null; // You must click on one of your own pieces.
}
activeSquare = sq;
dragging = false;
dragX = dragY = -1;
Move m = null;
if (selectedSquare >= 0) {
if (sq == selectedSquare) {
cancelSelection = true;

9
CuckooChess/src/main/java/tui/TUIGame.java
View File

@ -22,6 +22,7 @@ import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
import java.util.Locale;
import uci.UCIProtocol;
import chess.ChessParseError;
@ -89,14 +90,14 @@ public class TUIGame extends Game {
try {
int idx = cmd.indexOf(" ");
String filename = cmd.substring(0, idx);
String timeStr = cmd.substring(idx + 1, cmd.length());
String timeStr = cmd.substring(idx + 1);
int timeLimit = Integer.parseInt(timeStr);
// System.out.printf("file:%s time:%s (%d)\n", filename, timeStr, timeLimit);
fr = new LineNumberReader(new FileReader(filename));
String line;
Player pl = whitePlayer.isHumanPlayer() ? blackPlayer : whitePlayer;
if (pl.isHumanPlayer()) {
System.out.printf("No computer player available");
System.out.print("No computer player available");
return false;
}
ComputerPlayer cp = (ComputerPlayer)pl;
@ -178,9 +179,9 @@ public class TUIGame extends Game {
if (haveDrawOffer()) {
moveStr += " (offer draw)";
}
String msg = String.format("Last move: %d%s %s",
String msg = String.format(Locale.US, "Last move: %d%s %s",
prevPos.fullMoveCounter, prevPos.whiteMove ? "." : "...",
moveStr);
moveStr);
System.out.println(msg);
}
// System.out.printf("Hash: %016x\n", pos.zobristHash());

62
CuckooChess/src/main/java/uci/EngineControl.java
View File

@ -43,37 +43,37 @@ import java.util.Random;
/** Control the search thread. */
public class EngineControl {
PrintStream os;
private PrintStream os;
Thread engineThread;
private Thread engineThread;
private final Object threadMutex;
Search sc;
TranspositionTable tt;
History ht;
MoveGen moveGen;
private Search sc;
private TranspositionTable tt;
private History ht;
private MoveGen moveGen;
Position pos;
long[] posHashList;
int posHashListSize;
boolean ponder; // True if currently doing pondering
boolean onePossibleMove;
boolean infinite;
private Position pos;
private long[] posHashList;
private int posHashListSize;
private boolean ponder; // True if currently doing pondering
private boolean onePossibleMove;
private boolean infinite;
int minTimeLimit;
int maxTimeLimit;
int maxDepth;
int maxNodes;
List<Move> searchMoves;
private int minTimeLimit;
private int maxTimeLimit;
private int maxDepth;
private int maxNodes;
private List<Move> searchMoves;
// Options
int hashSizeMB = 16;
boolean ownBook = false;
boolean analyseMode = false;
boolean ponderMode = true;
private int hashSizeMB = 16;
private boolean ownBook = false;
private boolean analyseMode = false;
private boolean ponderMode = true;
// Reduced strength variables
int strength = 1000;
long randomSeed = 0;
private int strength = 1000;
private long randomSeed = 0;
/**
* This class is responsible for sending "info" strings during search.
@ -202,7 +202,7 @@ public class EngineControl {
final int margin = Math.min(1000, time * 9 / 10);
int timeLimit = (time + inc * (moves - 1) - margin) / moves;
minTimeLimit = (int)(timeLimit * 0.85);
maxTimeLimit = (int)(minTimeLimit * (Math.max(2.5, Math.min(4.0, moves / 2))));
maxTimeLimit = (int)(minTimeLimit * (Math.max(2.5, Math.min(4.0, moves * 0.5))));
// Leave at least 1s on the clock, but can't use negative time
minTimeLimit = clamp(minTimeLimit, 1, time - margin);
@ -368,13 +368,13 @@ public class EngineControl {
}
static void printOptions(PrintStream os) {
os.printf("option name Hash type spin default 16 min 1 max 2048%n");
os.printf("option name OwnBook type check default false%n");
os.printf("option name Ponder type check default true%n");
os.printf("option name UCI_AnalyseMode type check default false%n");
os.print("option name Hash type spin default 16 min 1 max 2048%n");
os.print("option name OwnBook type check default false%n");
os.print("option name Ponder type check default true%n");
os.print("option name UCI_AnalyseMode type check default false%n");
os.printf("option name UCI_EngineAbout type string default %s by Peter Osterlund, see http://web.comhem.se/petero2home/javachess/index.html%n",
ComputerPlayer.engineName);
os.printf("option name Strength type spin default 1000 min 0 max 1000\n");
os.print("option name Strength type spin default 1000 min 0 max 1000\n");
for (String pName : Parameters.instance().getParamNames()) {
ParamBase p = Parameters.instance().getParam(pName);
@ -396,7 +396,7 @@ public class EngineControl {
os.printf("option name %s type combo default %s ", cp.name, cp.defaultValue);
for (String s : cp.allowedValues)
os.printf(" var %s", s);
os.printf("\n");
os.print("\n");
break;
}
case BUTTON:
@ -428,7 +428,7 @@ public class EngineControl {
} else {
Parameters.instance().set(optionName, optionValue);
}
} catch (NumberFormatException nfe) {
} catch (NumberFormatException ignore) {
}
}
}

18
CuckooChess/src/main/java/uci/UCIProtocol.java
View File

@ -33,14 +33,14 @@ import java.util.ArrayList;
/** Handle the UCI protocol mode. */
public class UCIProtocol {
// Data set by the "position" command.
Position pos;
ArrayList<Move> moves;
private Position pos;
private ArrayList<Move> moves;
// Engine data
EngineControl engine;
private EngineControl engine;
// Set to true to break out of main loop
boolean quit;
private boolean quit;
public static void main(boolean autoStart) {
@ -54,7 +54,7 @@ public class UCIProtocol {
quit = false;
}
final public void mainLoop(InputStream is, PrintStream os, boolean autoStart) {
private void mainLoop(InputStream is, PrintStream os, boolean autoStart) {
try {
if (autoStart) {
handleCommand("uci", os);
@ -73,7 +73,7 @@ public class UCIProtocol {
}
}
final void handleCommand(String cmdLine, PrintStream os) {
private void handleCommand(String cmdLine, PrintStream os) {
String[] tokens = tokenize(cmdLine);
try {
String cmd = tokens[0];
@ -199,9 +199,9 @@ public class UCIProtocol {
}
quit = true;
}
} catch (ChessParseError ex) {
} catch (ArrayIndexOutOfBoundsException e) {
} catch (NumberFormatException nfe) {
} catch (ChessParseError ignore) {
} catch (ArrayIndexOutOfBoundsException ignore) {
} catch (NumberFormatException ignore) {
}
}

4
CuckooChess/src/test/java/uci/UCIProtocolTest.java
View File

@ -31,11 +31,11 @@ public class UCIProtocolTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
@Before

2
CuckooChessApp/src/main/java/org/petero/cuckoochess/ChessBoard.java
View File

@ -87,7 +87,6 @@ public class ChessBoard extends View {
/**
* Set the board to a given state.
* @param pos
*/
final public void setPosition(Position pos) {
this.pos = pos;
@ -96,7 +95,6 @@ public class ChessBoard extends View {
/**
* Set/clear the board flipped status.
* @param flipped
*/
final public void setFlipped(boolean flipped) {
this.flipped = flipped;

8
CuckooChessApp/src/main/java/org/petero/cuckoochess/CuckooChess.java
View File

@ -106,7 +106,7 @@ public class CuckooChess extends Activity implements GUIInterface {
ctrl = new ChessController(this);
ctrl.setThreadStackSize(32768);
readPrefs();
Typeface chessFont = Typeface.createFromAsset(getAssets(), "casefont.ttf");
cb.setFont(chessFont);
cb.setFocusable(true);
@ -297,8 +297,7 @@ public class CuckooChess extends Activity implements GUIInterface {
ctrl.reportPromotePiece(item);
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case CLIPBOARD_DIALOG: {
final CharSequence[] items = {"Copy Game", "Copy Position", "Paste"};
@ -334,8 +333,7 @@ public class CuckooChess extends Activity implements GUIInterface {
}
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
}
return null;

4
CuckooChessEngine/src/main/java/chess/Book.java
View File

@ -18,12 +18,8 @@
package chess;
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.HashMap;

20
CuckooChessEngine/src/main/java/chess/ComputerPlayer.java
View File

@ -40,16 +40,16 @@ public class ComputerPlayer implements Player {
engineName = name;
}
int minTimeMillis;
private int minTimeMillis;
int maxTimeMillis;
int maxDepth;
int maxNodes;
private int maxNodes;
public boolean verbose;
TranspositionTable tt;
Book book;
boolean bookEnabled;
boolean randomMode;
Search currentSearch;
private TranspositionTable tt;
private Book book;
private boolean bookEnabled;
private boolean randomMode;
private Search currentSearch;
public ComputerPlayer() {
minTimeMillis = 10000;
@ -67,7 +67,7 @@ public class ComputerPlayer implements Player {
tt = new TranspositionTable(logSize);
}
Search.Listener listener;
private Search.Listener listener;
public void setListener(Search.Listener listener) {
this.listener = listener;
}
@ -107,7 +107,7 @@ public class ComputerPlayer implements Player {
currentSearch = sc;
sc.setListener(listener);
Move bestM;
if ((moves.size == 1) && (canClaimDraw(pos, posHashList, posHashListSize, moves.m[0]) == "")) {
if ((moves.size == 1) && canClaimDraw(pos, posHashList, posHashListSize, moves.m[0]).isEmpty()) {
bestM = moves.m[0];
bestM.score = 0;
} else if (randomMode) {
@ -123,7 +123,7 @@ public class ComputerPlayer implements Player {
// Claim draw if appropriate
if (bestM.score <= 0) {
String drawClaim = canClaimDraw(pos, posHashList, posHashListSize, bestM);
if (drawClaim != "")
if (!drawClaim.isEmpty())
strMove = drawClaim;
}
return strMove;

2
CuckooChessEngine/src/main/java/chess/Evaluate.java
View File

@ -340,7 +340,7 @@ public class Evaluate {
// Knights
{
final int t1 = qV + 2 * rV + 1 * bV + 1 * nV + 6 * pV;
final int t1 = qV + 2 * rV + bV + nV + 6 * pV;
final int t2 = nV + 8 * pV;
int n1 = pos.psScore1[Piece.WKNIGHT];
int n2 = pos.psScore2[Piece.WKNIGHT];

11
CuckooChessEngine/src/main/java/chess/Game.java
View File

@ -26,12 +26,12 @@ import java.util.Locale;
public class Game {
protected List<Move> moveList = null;
protected List<UndoInfo> uiInfoList = null;
List<Boolean> drawOfferList = null;
private List<Boolean> drawOfferList = null;
protected int currentMove;
boolean pendingDrawOffer;
GameState drawState;
String drawStateMoveStr; // Move required to claim DRAW_REP or DRAW_50
GameState resignState;
private String drawStateMoveStr; // Move required to claim DRAW_REP or DRAW_50
private GameState resignState;
public Position pos = null;
protected Player whitePlayer;
protected Player blackPlayer;
@ -373,10 +373,7 @@ public class Game {
UndoInfo ui = new UndoInfo();
pos.makeMove(move, ui);
}
if ((whiteMove.length() > 0) || (blackMove.length() > 0)) {
if (whiteMove.length() == 0) {
whiteMove = "...";
}
if (whiteMove.length() > 0) {
if (compressed) {
ret.append(String.format(Locale.US, "%d. %s %s ",
pos.fullMoveCounter, whiteMove, blackMove));

4
CuckooChessEngine/src/main/java/chess/MoveGen.java
View File

@ -773,12 +773,12 @@ public final class MoveGen {
switch (d1) {
case 8: case -8: case 1: case -1: // Rook direction
if ((p == Piece.WQUEEN) || (p == Piece.WROOK))
if ((d1 != 0) && (MoveGen.nextPiece(pos, m.to, d1) == oKing))
if (MoveGen.nextPiece(pos, m.to, d1) == oKing)
return true;
break;
case 9: case 7: case -9: case -7: // Bishop direction
if ((p == Piece.WQUEEN) || (p == Piece.WBISHOP)) {
if ((d1 != 0) && (MoveGen.nextPiece(pos, m.to, d1) == oKing))
if (MoveGen.nextPiece(pos, m.to, d1) == oKing)
return true;
} else if (p == Piece.WPAWN) {
if (((d1 > 0) == wtm) && (pos.getPiece(m.to + d1) == oKing))

7
CuckooChessEngine/src/main/java/chess/Parameters.java
View File

@ -5,7 +5,7 @@ import java.util.Map;
import java.util.TreeMap;
public class Parameters {
public static enum Type {
public enum Type {
CHECK,
SPIN,
COMBO,
@ -115,8 +115,7 @@ public class Parameters {
return ((CheckParam)params.get(name.toLowerCase())).value;
}
final int getIntPar(String name) {
int ret = ((SpinParam)params.get(name.toLowerCase())).value;
return ret;
return ((SpinParam)params.get(name.toLowerCase())).value;
}
final String getStringPar(String name) {
return ((StringParam)params.get(name.toLowerCase())).value;
@ -141,7 +140,7 @@ public class Parameters {
int val = Integer.parseInt(value);
if ((val >= sp.minValue) && (val <= sp.maxValue))
sp.value = val;
} catch (NumberFormatException ex) {
} catch (NumberFormatException ignore) {
}
break;
}

2
CuckooChessEngine/src/main/java/chess/Position.java
View File

@ -307,7 +307,7 @@ public class Position {
* Set a square to a piece value.
* Special version that only updates enough of the state for the SEE function to be happy.
*/
public final void setSEEPiece(int square, int piece) {
private void setSEEPiece(int square, int piece) {
int removedPiece = squares[square];
// Update board

26
CuckooChessEngine/src/main/java/chess/TextIO.java
View File

@ -396,13 +396,12 @@ public class TextIO {
* @return A move object, or null if move has invalid syntax
*/
public static Move uciStringToMove(String move) {
Move m = null;
if ((move.length() < 4) || (move.length() > 5))
return m;
return null;
int fromSq = TextIO.getSquare(move.substring(0, 2));
int toSq = TextIO.getSquare(move.substring(2, 4));
if ((fromSq < 0) || (toSq < 0)) {
return m;
return null;
}
char prom = ' ';
boolean white = true;
@ -413,7 +412,7 @@ public class TextIO {
} else if (Position.getY(toSq) == 0) {
white = false;
} else {
return m;
return null;
}
}
int promoteTo;
@ -434,20 +433,15 @@ public class TextIO {
promoteTo = white ? Piece.WKNIGHT : Piece.BKNIGHT;
break;
default:
return m;
return null;
}
m = new Move(fromSq, toSq, promoteTo);
return m;
return new Move(fromSq, toSq, promoteTo);
}
private static boolean isCapture(Position pos, Move move) {
if (pos.getPiece(move.to) == Piece.EMPTY) {
int p = pos.getPiece(move.from);
if ((p == (pos.whiteMove ? Piece.WPAWN : Piece.BPAWN)) && (move.to == pos.getEpSquare())) {
return true;
} else {
return false;
}
return (p == (pos.whiteMove ? Piece.WPAWN : Piece.BPAWN)) && (move.to == pos.getEpSquare());
} else {
return true;
}
@ -460,9 +454,8 @@ public class TextIO {
*/
public static Move stringToMove(Position pos, String strMove) {
strMove = strMove.replaceAll("=", "");
Move move = null;
if (strMove.length() == 0)
return move;
return null;
MoveGen.MoveList moves = MoveGen.instance.pseudoLegalMoves(pos);
MoveGen.removeIllegal(pos, moves);
{
@ -501,7 +494,8 @@ public class TextIO {
}
}
}
Move move = null;
for (int i = 0; i < 2; i++) {
// Search for unique substring match
for (int mi = 0; mi < moves.size; mi++) {
@ -526,7 +520,7 @@ public class TextIO {
if (move != null)
return move;
}
return move;
return null;
}
/**

6
CuckooChessEngine/src/main/java/chess/TranspositionTable.java
View File

@ -107,9 +107,9 @@ public class TranspositionTable {
depthSlot |= (s << 15);
}
}
TTEntry[] table;
TTEntry emptySlot;
byte generation;
private TTEntry[] table;
private TTEntry emptySlot;
private byte generation;
/** Constructor. Creates an empty transposition table with numEntries slots. */
public TranspositionTable(int log2Size) {

30
CuckooChessEngine/src/main/java/chess/TreeLogger.java
View File

@ -37,7 +37,7 @@ import chess.TranspositionTable.TTEntry;
public final class TreeLogger {
private byte[] entryBuffer = new byte[16];
private ByteBuffer bb = ByteBuffer.wrap(entryBuffer);
// Used in write mode
private FileOutputStream os = null;
private BufferedOutputStream bos = null;
@ -96,7 +96,7 @@ public final class TreeLogger {
} catch (IOException e) {
throw new RuntimeException();
} finally {
if (raf != null) try { raf.close(); } catch (IOException e) {}
if (raf != null) try { raf.close(); } catch (IOException ignore) {}
}
}
@ -104,7 +104,7 @@ public final class TreeLogger {
try {
if (bos != null) bos.close();
if (fc != null) fc.close();
} catch (IOException e) {
} catch (IOException ignore) {
}
}
@ -143,7 +143,7 @@ public final class TreeLogger {
/**
* Log information when entering a search node.
* @param parentId Index of parent node.
* @param parentIndex Index of parent node.
* @param m Move made to go from parent node to this node
* @param alpha Search parameter
* @param beta Search parameter
@ -199,7 +199,7 @@ public final class TreeLogger {
private void computeForwardPointers() {
if ((mapBuf.get(127) & (1<<7)) != 0)
return;
System.out.printf("Computing forward pointers...\n");
System.out.print("Computing forward pointers...\n");
StartEntry se = new StartEntry();
EndEntry ee = new EndEntry();
for (int i = 0; i < numEntries; i++) {
@ -296,7 +296,7 @@ public final class TreeLogger {
ArrayList<Move> moves = getMoveSequence(currIndex);
for (Move m : moves)
System.out.printf(" %s", TextIO.moveToUCIString(m));
System.out.printf("\n");
System.out.print("\n");
printNodeInfo(rootPos, currIndex);
Position pos = getPosition(rootPos, currIndex);
System.out.print(TextIO.asciiBoard(pos));
@ -309,7 +309,7 @@ public final class TreeLogger {
}
}
doPrint = true;
System.out.printf("Command:");
System.out.print("Command:");
String cmdStr = in.readLine();
if (cmdStr == null)
return;
@ -332,10 +332,10 @@ public final class TreeLogger {
found.add(c);
}
if (found.size() == 0) {
System.out.printf("No such move\n");
System.out.print("No such move\n");
doPrint = false;
} else if (found.size() > 1) {
System.out.printf("Ambiguous move\n");
System.out.print("Ambiguous move\n");
for (Integer c : found)
printNodeInfo(rootPos, c);
doPrint = false;
@ -370,7 +370,7 @@ public final class TreeLogger {
ArrayList<Move> moves = getMoveSequence(currIndex);
for (Move m : moves)
System.out.printf(" %s", TextIO.moveToUCIString(m));
System.out.printf("\n");
System.out.print("\n");
doPrint = false;
} else if (cmdStr.startsWith("h")) {
long hashKey = getPosition(rootPos, currIndex).historyHash();
@ -384,7 +384,7 @@ public final class TreeLogger {
int i = Integer.parseInt(cmdStr);
if ((i >= -1) && (i < numEntries))
currIndex = i;
} catch (NumberFormatException e) {
} catch (NumberFormatException ignore) {
}
}
prevStr = cmdStr;
@ -437,7 +437,7 @@ public final class TreeLogger {
s = s.substring(2);
try {
key = Long.parseLong(s, 16);
} catch (NumberFormatException e) {
} catch (NumberFormatException ignore) {
}
}
return key;
@ -450,13 +450,13 @@ public final class TreeLogger {
if (idx > 0) {
return Integer.parseInt(s.substring(idx+1));
}
} catch (NumberFormatException e) {
} catch (NumberFormatException ignore) {
}
return defVal;
}
/** Get a list of integer parameters from an input string. */
final ArrayList<Integer> getArgs(String s, int defVal) {
private ArrayList<Integer> getArgs(String s, int defVal) {
ArrayList<Integer> ret = new ArrayList<>();
String[] split = s.split(" ");
try {
@ -612,7 +612,7 @@ public final class TreeLogger {
System.out.printf(" s:%s%6d e:%6d sub:%d", type, ee.score, ee.evalScore,
subTreeNodes);
}
System.out.printf("\n");
System.out.print("\n");
}
}
}

32
CuckooChessEngine/src/main/java/guibase/ChessController.java
View File

@ -41,16 +41,16 @@ import java.util.Scanner;
/** The glue between the chess engine and the GUI. */
public class ChessController {
Player humanPlayer;
ComputerPlayer computerPlayer;
private Player humanPlayer;
private ComputerPlayer computerPlayer;
Game game;
GUIInterface gui;
boolean humanIsWhite;
Thread computerThread;
int threadStack; // Thread stack size, or zero to use OS default
private GUIInterface gui;
private boolean humanIsWhite;
private Thread computerThread;
private int threadStack; // Thread stack size, or zero to use OS default
// Search statistics
String thinkingPV;
private String thinkingPV;
class SearchListener implements Search.Listener {
int currDepth = 0;
@ -133,7 +133,7 @@ public class ChessController {
setSearchInfo();
}
}
SearchListener listener;
private SearchListener listener;
public ChessController(GUIInterface gui) {
this.gui = gui;
@ -172,10 +172,8 @@ public class ChessController {
Position pos = TextIO.readFEN(fen);
game.processString("new");
game.pos = pos;
String[] strArr = posHistStr.get(1).split(" ");
final int arrLen = strArr.length;
for (int i = 0; i < arrLen; i++) {
game.processString(strArr[i]);
for (String s : posHistStr.get(1).split(" ")) {
game.processString(s);
}
int numUndo = Integer.parseInt(posHistStr.get(2));
for (int i = 0; i < numUndo; i++) {
@ -223,11 +221,9 @@ public class ChessController {
pgn.append("[SetUp \"1\"]\n");
}
pgn.append("\n");
String[] strArr = moves.split(" ");
int currLineLength = 0;
final int arrLen = strArr.length;
for (int i = 0; i < arrLen; i++) {
String move = strArr[i].trim();
for (String s : moves.split(" ")) {
String move = s.trim();
int moveLen = move.length();
if (moveLen > 0) {
if (currLineLength + 1 + moveLen >= 80) {
@ -408,7 +404,7 @@ public class ChessController {
}
}
Move promoteMove;
private Move promoteMove;
public final void reportPromotePiece(int choice) {
final boolean white = game.pos.whiteMove;
int promoteTo;
@ -482,7 +478,7 @@ public class ChessController {
gui.setMoveListString(str);
}
public final void setThinkingPV() {
private void setThinkingPV() {
String str = "";
if (gui.showThinking()) {
str = thinkingPV;

13
CuckooChessEngine/src/test/java/chess/BitBoardTest.java
View File

@ -29,16 +29,15 @@ public class BitBoardTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/** Test of kingAttacks, of class BitBoard. */
@Test
public void testKingAttacks() throws ChessParseError {
public void testKingAttacks() {
System.out.println("kingAttacks");
assertEquals(5, Long.bitCount(BitBoard.kingAttacks[TextIO.getSquare("g1")]));
assertEquals(3, Long.bitCount(BitBoard.kingAttacks[TextIO.getSquare("h1")]));
@ -49,9 +48,8 @@ public class BitBoardTest {
assertEquals(8, Long.bitCount(BitBoard.kingAttacks[TextIO.getSquare("b2")]));
}
/** Test of knightAttacks, of class BitBoard. */
@Test
public void testKnightAttacks() throws ChessParseError {
public void testKnightAttacks() {
System.out.println("knightAttacks");
assertEquals(3, Long.bitCount(BitBoard.knightAttacks[TextIO.getSquare("g1")]));
assertEquals(2, Long.bitCount(BitBoard.knightAttacks[TextIO.getSquare("a1")]));
@ -65,9 +63,8 @@ public class BitBoardTest {
BitBoard.knightAttacks[TextIO.getSquare("g1")]);
}
/** Test of squaresBetween[][], of class BitBoard. */
@Test
public void testSquaresBetween() throws ChessParseError {
public void testSquaresBetween() {
System.out.println("squaresBetween");
// Tests that the set of nonzero elements is correct
for (int sq1 = 0; sq1 < 64; sq1++) {

12
CuckooChessEngine/src/test/java/chess/BookTest.java
View File

@ -29,16 +29,13 @@ public class BookTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of getBookMove method, of class Book.
*/
@Test
public void testGetBookMove() throws ChessParseError {
System.out.println("getBookMove");
@ -48,9 +45,6 @@ public class BookTest {
checkValid(pos, move);
}
/**
* Test of getAllBookMoves method, of class Book.
*/
@Test
public void testGetAllBookMoves() throws ChessParseError {
System.out.println("getAllBookMoves");
@ -67,7 +61,7 @@ public class BookTest {
/** Check that move is a legal move in position pos. */
private void checkValid(Position pos, Move move) {
assertTrue(move != null);
assertNotNull(move);
MoveGen.MoveList moveList = new MoveGen().pseudoLegalMoves(pos);
MoveGen.removeIllegal(pos, moveList);
boolean contains = false;

12
CuckooChessEngine/src/test/java/chess/ComputerPlayerTest.java
View File

@ -30,16 +30,13 @@ public class ComputerPlayerTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of getCommand method, of class ComputerPlayer.
*/
@Test
public void testGetCommand() throws ChessParseError {
System.out.println("getCommand");
@ -71,11 +68,8 @@ public class ComputerPlayerTest {
assertEquals("Kxg8", result);
}
/**
* Test of draw by repetition, of class ComputerPlayer.
*/
@Test
public void testDrawRep() throws ChessParseError {
public void testDrawRep() {
System.out.println("drawRep");
Game game = new Game(new HumanPlayer(), new HumanPlayer());
ComputerPlayer cp = new ComputerPlayer();

27
CuckooChessEngine/src/test/java/chess/EvaluateTest.java
View File

@ -36,9 +36,6 @@ public class EvaluateTest {
public static void tearDownClass() throws Exception {
}
/**
* Test of evalPos method, of class Evaluate.
*/
@Test
public void testEvalPos() throws ChessParseError {
System.out.println("evalPos");
@ -102,9 +99,6 @@ public class EvaluateTest {
assertTrue(sc2 > sc1);
}
/**
* Test of pieceSquareEval method, of class Evaluate.
*/
@Test
public void testPieceSquareEval() throws ChessParseError {
System.out.println("pieceSquareEval");
@ -143,9 +137,6 @@ public class EvaluateTest {
assertTrue(score > 100); // Two rooks on 7:th rank is very good
}
/**
* Test of tradeBonus method, of class Evaluate.
*/
@Test
public void testTradeBonus() throws ChessParseError {
System.out.println("tradeBonus");
@ -172,9 +163,6 @@ public class EvaluateTest {
assertTrue(score2 > score1); // White ahead, trading pieces is good
}
/**
* Test of material method, of class Evaluate.
*/
@Test
public void testMaterial() throws ChessParseError {
System.out.println("material");
@ -204,9 +192,6 @@ public class EvaluateTest {
assertEquals(-pV+qV, Evaluate.material(pos));
}
/**
* Test of kingSafety method, of class Evaluate.
*/
@Test
public void testKingSafety() throws ChessParseError {
System.out.println("kingSafety");
@ -233,9 +218,6 @@ public class EvaluateTest {
assertTrue(s2 < s1);
}
/**
* Test of endGameEval method, of class Evaluate.
*/
@Test
public void testEndGameEval() throws ChessParseError {
System.out.println("endGameEval");
@ -312,9 +294,6 @@ public class EvaluateTest {
assertTrue(score > 0);
}
/**
* Test of endGameEval method, of class Evaluate.
*/
@Test
public void testPassedPawns() throws ChessParseError {
System.out.println("passedPawns");
@ -341,9 +320,6 @@ public class EvaluateTest {
// assertTrue(score2 > score); // Advancing passed pawn is good
}
/**
* Test of endGameEval method, of class Evaluate.
*/
@Test
public void testBishAndRookPawns() throws ChessParseError {
System.out.println("bishAndRookPawns");
@ -394,9 +370,6 @@ public class EvaluateTest {
assertTrue(evalWhite(pos) > 0); // Black has trapped bishop
}
/**
* Test of endGameEval method, of class Evaluate.
*/
@Test
public void testKQKP() throws ChessParseError {
System.out.println("KQKP");

28
CuckooChessEngine/src/test/java/chess/GameTest.java
View File

@ -29,16 +29,13 @@ public class GameTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of haveDrawOffer method, of class Game.
*/
@Test
public void testHaveDrawOffer() {
System.out.println("haveDrawOffer");
@ -129,9 +126,6 @@ public class GameTest {
assertEquals(false, game.haveDrawOffer());
}
/**
* Test of draw by 50 move rule, of class Game.
*/
@Test
public void testDraw50() {
System.out.println("draw50");
@ -188,9 +182,6 @@ public class GameTest {
assertEquals(Game.GameState.ALIVE, game.drawState);
}
/**
* Test of draw by repetition, of class Game.
*/
@Test
public void testDrawRep() {
System.out.println("drawRep");
@ -262,9 +253,6 @@ public class GameTest {
assertEquals(Game.GameState.DRAW_REP, game.getGameState());
}
/**
* Test of resign command, of class Game.
*/
@Test
public void testResign() {
System.out.println("resign");
@ -289,9 +277,6 @@ public class GameTest {
assertEquals(Game.GameState.BLACK_MATE, game.getGameState()); // Can't resign after game over
}
/**
* Test of processString method, of class Game.
*/
@Test
public void testProcessString() throws ChessParseError {
System.out.println("processString");
@ -344,9 +329,6 @@ public class GameTest {
assertEquals(false, res);
}
/**
* Test of getGameState method, of class Game.
*/
@Test
public void testGetGameState() {
System.out.println("getGameState");
@ -362,9 +344,6 @@ public class GameTest {
assertEquals(Game.GameState.BLACK_STALEMATE, game.getGameState());
}
/**
* Test of insufficientMaterial method, of class Game.
*/
@Test
public void testInsufficientMaterial() {
System.out.println("insufficientMaterial");
@ -407,9 +386,6 @@ public class GameTest {
assertEquals(Game.GameState.ALIVE, game.getGameState());
}
/**
* Test of perfT method, of class Game.
*/
@Test
public void testPerfT() {
System.out.println("perfT");

7
CuckooChessEngine/src/test/java/chess/HistoryTest.java
View File

@ -31,11 +31,11 @@ public class HistoryTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
@Before
@ -46,9 +46,6 @@ public class HistoryTest {
public void tearDown() {
}
/**
* Test of getHistScore method, of class History.
*/
@Test
public void testGetHistScore() throws ChessParseError {
System.out.println("getHistScore");

10
CuckooChessEngine/src/test/java/chess/KillerTableTest.java
View File

@ -29,16 +29,13 @@ public class KillerTableTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of addKiller method, of class KillerTable.
*/
@Test
public void testAddKiller() {
System.out.println("addKiller");
@ -50,9 +47,6 @@ public class KillerTableTest {
kt.addKiller(3, m);
}
/**
* Test of getKillerScore method, of class KillerTable.
*/
@Test
public void testGetKillerScore() {
System.out.println("getKillerScore");

22
CuckooChessEngine/src/test/java/chess/MoveGenTest.java
View File

@ -31,16 +31,13 @@ public class MoveGenTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of pseudoLegalMoves method, of class MoveGen.
*/
@Test
public void testPseudoLegalMoves() throws ChessParseError {
System.out.println("pseudoLegalMoves");
@ -86,9 +83,6 @@ public class MoveGenTest {
assertTrue(strMoves.contains("e1c1"));
}
/**
* Test of pseudoLegalMoves method, of class MoveGen. Pawn moves.
*/
@Test
public void testPawnMoves() throws ChessParseError {
System.out.println("pawnMoves");
@ -128,9 +122,6 @@ public class MoveGenTest {
assertTrue(strMoves.contains("a2a1b"));
}
/**
* Test of inCheck method, of class MoveGen.
*/
@Test
public void testInCheck() {
System.out.println("inCheck");
@ -163,9 +154,6 @@ public class MoveGenTest {
assertEquals(false, MoveGen.inCheck(pos));
}
/**
* Test of givesCheck method, of class MoveGen.
*/
@Test
public void testGivesCheck() throws ChessParseError {
System.out.println("givesCheck");
@ -321,9 +309,6 @@ public class MoveGenTest {
assertTrue(MoveGen.givesCheck(pos, TextIO.stringToMove(pos, "exf3")));
}
/**
* Test of removeIllegal method, of class MoveGen.
*/
@Test
public void testRemoveIllegal() throws ChessParseError {
System.out.println("removeIllegal");
@ -347,9 +332,6 @@ public class MoveGenTest {
assertEquals(1, strMoves.size());
}
/**
* Test that if king capture is possible, only a king capture move is returned in the move list.
*/
@Test
public void testKingCapture() throws ChessParseError {
System.out.println("kingCapture");

10
CuckooChessEngine/src/test/java/chess/MoveTest.java
View File

@ -31,11 +31,11 @@ public class MoveTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
@Before
@ -46,9 +46,6 @@ public class MoveTest {
public void tearDown() {
}
/**
* Test of move constructor, of class Move.
*/
@Test
public void testMoveConstructor() {
System.out.println("MoveTest");
@ -61,9 +58,6 @@ public class MoveTest {
assertEquals(move.promoteTo, p);
}
/**
* Test of equals, of class Move.
*/
@Test
public void testEquals() {
System.out.println("equals");

7
CuckooChessEngine/src/test/java/chess/PieceTest.java
View File

@ -29,16 +29,13 @@ public class PieceTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of isWhite method, of class Piece.
*/
@Test
public void testIsWhite() {
System.out.println("isWhite");

33
CuckooChessEngine/src/test/java/chess/PositionTest.java
View File

@ -33,11 +33,11 @@ public class PositionTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
@Before
@ -48,9 +48,6 @@ public class PositionTest {
public void tearDown() {
}
/**
* Test of getPiece method, of class Position.
*/
@Test
public void testGetPiece() throws ChessParseError {
System.out.println("getPiece");
@ -71,9 +68,6 @@ public class PositionTest {
}
}
/**
* Test of getIndex method, of class Position.
*/
@Test
public void testGetIndex() {
System.out.println("getIndex");
@ -88,9 +82,6 @@ public class PositionTest {
}
}
/**
* Test of setPiece method, of class Position.
*/
@Test
public void testSetPiece() {
System.out.println("setPiece");
@ -100,9 +91,6 @@ public class PositionTest {
assertEquals(Piece.WKING, instance.getPiece(Position.getSquare(3, 4)));
}
/**
* Test of makeMove method, of class Position.
*/
@Test
public void testMakeMove() throws ChessParseError {
System.out.println("makeMove");
@ -212,9 +200,6 @@ public class PositionTest {
assertEquals(castleMask, pos.getCastleMask());
}
/**
* Test of makeMove method, of class Position.
*/
@Test
public void testPromotion() throws ChessParseError {
System.out.println("promotion");
@ -251,10 +236,7 @@ public class PositionTest {
pos.unMakeMove(move, ui);
assertEquals(origPos, pos);
}
/**
* Test move counters, of class Position.
*/
@Test
public void testMoveCounters() throws ChessParseError {
System.out.println("moveCounters");
@ -316,9 +298,6 @@ public class PositionTest {
assertEquals(69, pos.fullMoveCounter);
}
/**
* Test of drawRuleEquals, of class Position.
*/
@Test
public void testDrawRuleEquals() throws ChessParseError {
System.out.println("drawRuleEquals");
@ -361,9 +340,6 @@ public class PositionTest {
assertEquals(false, pos.drawRuleEquals(origPos)); // Not equal, en passant rights lost
}
/**
* Test of hashCode method, of class Position.
*/
@Test
public void testHashCode() throws ChessParseError {
System.out.println("hashCode");
@ -417,9 +393,6 @@ public class PositionTest {
}
}
/**
* Test of getKingSq method, of class Position.
*/
@Test
public void testGetKingSq() throws ChessParseError {
System.out.println("getKingSq");

25
CuckooChessEngine/src/test/java/chess/SearchTest.java
View File

@ -34,16 +34,13 @@ public class SearchTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of negaScout method, of class Search.
*/
@Test
public void testNegaScout() throws ChessParseError, StopSearch {
System.out.println("negaScout");
@ -89,9 +86,6 @@ public class SearchTest {
assertTrue(!TextIO.moveToString(pos, bestM, false).equals("Qxb3"));
}
/**
* Test of draw by 50 move rule, of class Search.
*/
@Test
public void testDraw50() throws ChessParseError, StopSearch {
System.out.println("draw50");
@ -151,9 +145,6 @@ public class SearchTest {
assertEquals(mateInThree, score); // Need an extra pawn move to avoid 50-move rule
}
/**
* Test of draw by repetition rule, of class Search.
*/
@Test
public void testDrawRep() throws ChessParseError, StopSearch {
System.out.println("drawRep");
@ -190,9 +181,6 @@ public class SearchTest {
assertEquals(0, score); // Draw, black can not escape from perpetual checks
}
/**
* Test of hash table, of class Search.
*/
@Test
public void testHashing() throws ChessParseError {
System.out.println("hashing");
@ -202,9 +190,6 @@ public class SearchTest {
assertEquals(TextIO.stringToMove(pos, "Kb1"), new Move(bestM));
}
/**
* Late move pruning must not be used in mate search.
*/
@Test
public void testLMP() throws ChessParseError {
Position pos = TextIO.readFEN("2r2rk1/6p1/p3pq1p/1p1b1p2/3P1n2/PP3N2/3N1PPP/1Q2RR1K b"); // WAC 174
@ -270,9 +255,6 @@ public class SearchTest {
return see;
}
/**
* Test of SEE method, of class Search.
*/
@Test
public void testSEE() throws ChessParseError {
System.out.println("SEE");
@ -423,9 +405,6 @@ public class SearchTest {
assertEquals(h1, h2);
}
/**
* Test of scoreMoveList method, of class Search.
*/
@Test
public void testScoreMoveList() throws ChessParseError {
System.out.println("SEEorder");

31
CuckooChessEngine/src/test/java/chess/TextIOTest.java
View File

@ -31,11 +31,11 @@ public class TextIOTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
@Before
@ -46,9 +46,6 @@ public class TextIOTest {
public void tearDown() {
}
/**
* Test of readFEN method, of class TextIO.
*/
@Test
public void testReadFEN() throws ChessParseError {
System.out.println("readFEN");
@ -123,9 +120,6 @@ public class TextIOTest {
return wasError;
}
/**
* Test of moveToString method, of class TextIO.
*/
@Test
public void testMoveToString() throws ChessParseError {
System.out.println("moveToString");
@ -162,9 +156,6 @@ public class TextIOTest {
assertEquals("c7-c8Q+", result);
}
/**
* Test of moveToString method, of class TextIO, mate/stalemate tests.
*/
@Test
public void testMoveToStringMate() throws ChessParseError {
System.out.println("moveToStringMate");
@ -188,9 +179,6 @@ public class TextIOTest {
assertEquals("b7-b8B", result); // stalemate
}
/**
* Test of moveToString method, of class TextIO, short form.
*/
@Test
public void testMoveToStringShortForm() throws ChessParseError {
System.out.println("moveToStringShortForm");
@ -240,9 +228,6 @@ public class TextIOTest {
assertEquals("Rfd8", result); // File disambiguation needed
}
/**
* Test of stringToMove method, of class TextIO.
*/
@Test
public void testStringToMove() throws ChessParseError {
System.out.println("stringToMove");
@ -324,9 +309,6 @@ public class TextIOTest {
assertEquals(m2, m);
}
/**
* Test of getSquare method, of class TextIO.
*/
@Test
public void testGetSquare() throws ChessParseError {
System.out.println("getSquare");
@ -338,9 +320,6 @@ public class TextIOTest {
assertEquals(Position.getSquare(7, 7), TextIO.getSquare("h8"));
}
/**
* Test of squareToString method, of class TextIO.
*/
@Test
public void testSquareToString() {
System.out.println("squareToString");
@ -349,9 +328,6 @@ public class TextIOTest {
assertEquals("e4", TextIO.squareToString(Position.getSquare(4, 3)));
}
/**
* Test of asciiBoard method, of class TextIO.
*/
@Test
public void testAsciiBoard() throws ChessParseError {
System.out.println("asciiBoard");
@ -363,9 +339,6 @@ public class TextIOTest {
assertEquals(3, aBrd.length() - aBrd.replaceAll(" P", " ").length()); // 3 white pawns
}
/**
* Test of uciStringToMove method, of class TextIO.
*/
@Test
public void testUciStringToMove() throws ChessParseError {
System.out.println("stringToMove");

10
CuckooChessEngine/src/test/java/chess/TranspositionTableTest.java
View File

@ -30,16 +30,13 @@ public class TranspositionTableTest {
}
@BeforeClass
public static void setUpClass() throws Exception {
public static void setUpClass() {
}
@AfterClass
public static void tearDownClass() throws Exception {
public static void tearDownClass() {
}
/**
* Test of TTEntry nested class, of class TranspositionTable.
*/
@Test
public void testTTEntry() throws ChessParseError {
System.out.println("TTEntry");
@ -115,9 +112,6 @@ public class TranspositionTableTest {
assertEquals(score - 2, ent3.getScore(ply - 2));
}
/**
* Test of insert method, of class TranspositionTable.
*/
@Test
public void testInsert() throws ChessParseError {
System.out.println("insert");

2
CuckooChessEngine/src/test/java/guibase/ChessControllerTest.java
View File

@ -35,7 +35,7 @@ public class ChessControllerTest {
ctrl.setPGN("[FEN \"k/8/8/8/8/8/KP/8 w\"]\n");
assertEquals(TextIO.getSquare("a2"), ctrl.game.pos.getKingSq(true));
assertEquals(TextIO.getSquare("a8"), ctrl.game.pos.getKingSq(false));
ctrl.setPGN("1.e4 e5 2. Nf3!!! $6 (Nc3 (a3)) Nc6?? Bb5!!? a6?! * Ba4");
assertEquals(Piece.BPAWN, ctrl.game.pos.getPiece(TextIO.getSquare("a6")));
assertEquals(Piece.WBISHOP, ctrl.game.pos.getPiece(TextIO.getSquare("b5")));

6
DroidFishApp/src/androidTest/java/org/petero/droidfish/book/BookTest.java
View File

@ -35,9 +35,6 @@ public class BookTest extends TestCase {
public BookTest() {
}
/**
* Test of getBookMove method, of class Book.
*/
public void testGetBookMove() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
DroidBook book = DroidBook.getInstance();
@ -50,9 +47,6 @@ public class BookTest extends TestCase {
assertEquals(null, move);
}
/**
* Test of getAllBookMoves method, of class Book.
*/
public void testGetAllBookMoves() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
DroidBook book = DroidBook.getInstance();

3
DroidFishApp/src/androidTest/java/org/petero/droidfish/book/PolyglotBookTest.java
View File

@ -31,9 +31,6 @@ public class PolyglotBookTest extends TestCase {
public PolyglotBookTest() {
}
/**
* Test of getBookMove method, of class Book.
*/
public void testGetHashKey() throws ChessParseError {
// starting position
Position pos = TextIO.readFEN("rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1");

24
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/GameTest.java
View File

@ -30,9 +30,6 @@ public class GameTest extends TestCase {
public GameTest() {
}
/**
* Test of haveDrawOffer method, of class Game.
*/
public void testHaveDrawOffer() {
Game game = new Game(null, new TimeControlData());
assertEquals(false, game.haveDrawOffer());
@ -134,9 +131,6 @@ public class GameTest extends TestCase {
assertEquals(false, game.haveDrawOffer());
}
/**
* Test of draw by 50 move rule, of class Game.
*/
public void testDraw50() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(false, game.haveDrawOffer());
@ -196,9 +190,6 @@ public class GameTest extends TestCase {
assertEquals(Game.GameState.WHITE_MATE, game.getGameState()); // Can't claim draw when game over
}
/**
* Test of draw by repetition, of class Game.
*/
public void testDrawRep() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(false, game.haveDrawOffer());
@ -268,9 +259,6 @@ public class GameTest extends TestCase {
assertEquals(Game.GameState.DRAW_REP, game.getGameState());
}
/**
* Test of draw offer/accept/request command.
*/
public void testDrawBug() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(false, game.haveDrawOffer());
@ -286,9 +274,6 @@ public class GameTest extends TestCase {
assertEquals(Piece.EMPTY, game.tree.currentPos.getPiece(TextIO.getSquare("e5")));
}
/**
* Test of resign command, of class Game.
*/
public void testResign() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(Game.GameState.ALIVE, game.getGameState());
@ -316,9 +301,6 @@ public class GameTest extends TestCase {
assertEquals(Game.GameState.RESIGN_BLACK, game.getGameState());
}
/**
* Test of processString method, of class Game.
*/
public void testProcessString() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(TextIO.startPosFEN, TextIO.toFEN(game.currPos()));
@ -373,9 +355,6 @@ public class GameTest extends TestCase {
assertEquals(null, p.second);
}
/**
* Test of getGameState method, of class Game.
*/
public void testGetGameState() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(Game.GameState.ALIVE, game.getGameState());
@ -389,9 +368,6 @@ public class GameTest extends TestCase {
assertEquals(Game.GameState.BLACK_STALEMATE, game.getGameState());
}
/**
* Test of insufficientMaterial method, of class Game.
*/
public void testInsufficientMaterial() throws ChessParseError {
Game game = new Game(null, new TimeControlData());
assertEquals(Game.GameState.ALIVE, game.getGameState());

12
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/MoveGenTest.java
View File

@ -28,9 +28,6 @@ public class MoveGenTest extends TestCase {
public MoveGenTest() {
}
/**
* Test of pseudoLegalMoves method, of class MoveGen.
*/
public void testPseudoLegalMoves() throws ChessParseError {
String fen = "8/3k4/8/2n2pP1/1P6/1NB5/2QP4/R3K2R w KQ f6 0 2";
Position pos = TextIO.readFEN(fen);
@ -74,9 +71,6 @@ public class MoveGenTest extends TestCase {
assertTrue(strMoves.contains("O-O-O"));
}
/**
* Test of pseudoLegalMoves method, of class MoveGen. Pawn moves.
*/
public void testPawnMoves() throws ChessParseError {
String fen = "1r2k3/P1pppp2/8/1pP3p1/1nPp2P1/n4p1P/1P2PP2/4KBNR w K b6 0 1";
Position pos = TextIO.readFEN(fen);
@ -114,9 +108,6 @@ public class MoveGenTest extends TestCase {
assertTrue(strMoves.contains("a2-a1B"));
}
/**
* Test of inCheck method, of class MoveGen.
*/
public void testInCheck() {
Position pos = new Position();
pos.setPiece(Position.getSquare(4,2), Piece.WKING);
@ -147,9 +138,6 @@ public class MoveGenTest extends TestCase {
assertEquals(false, MoveGen.inCheck(pos));
}
/**
* Test of removeIllegal method, of class MoveGen.
*/
public void testRemoveIllegal() throws ChessParseError {
Position pos = TextIO.readFEN("8/3k4/8/2n1rpP1/1P6/1NB5/2QP4/R3K2R w KQ f6 0 1");
List<String> strMoves = getMoveList(pos, true);

6
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/MoveTest.java
View File

@ -25,9 +25,6 @@ public class MoveTest extends TestCase {
public MoveTest() {
}
/**
* Test of move constructor, of class Move.
*/
public void testMoveConstructor() {
int f = Position.getSquare(4, 1);
int t = Position.getSquare(4, 3);
@ -38,9 +35,6 @@ public class MoveTest extends TestCase {
assertEquals(move.promoteTo, p);
}
/**
* Test of equals, of class Move.
*/
public void testEquals() {
Move m1 = new Move(Position.getSquare(0, 6), Position.getSquare(1, 7), Piece.WROOK);
Move m2 = new Move(Position.getSquare(0, 6), Position.getSquare(0, 7), Piece.WROOK);

3
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/PieceTest.java
View File

@ -26,9 +26,6 @@ public class PieceTest extends TestCase {
public PieceTest() {
}
/**
* Test of isWhite method, of class Piece.
*/
public void testIsWhite() {
assertEquals(false, Piece.isWhite(Piece.BBISHOP));
assertEquals(true , Piece.isWhite(Piece.WBISHOP));

27
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/PositionTest.java
View File

@ -28,9 +28,6 @@ public class PositionTest extends TestCase {
public PositionTest() {
}
/**
* Test of getPiece method, of class Position.
*/
public void testGetPiece() throws ChessParseError {
Position pos = new Position();
int result = pos.getPiece(0);
@ -49,9 +46,6 @@ public class PositionTest extends TestCase {
}
}
/**
* Test of getIndex method, of class Position.
*/
public void testGetIndex() {
for (int x = 0; x < 8; x++) {
for (int y = 0; y < 8; y++) {
@ -64,9 +58,6 @@ public class PositionTest extends TestCase {
}
}
/**
* Test of setPiece method, of class Position.
*/
public void testSetPiece() {
Position instance = new Position();
assertEquals(Piece.EMPTY, instance.getPiece(Position.getSquare(0, 0)));
@ -74,9 +65,6 @@ public class PositionTest extends TestCase {
assertEquals(Piece.WKING, instance.getPiece(Position.getSquare(3, 4)));
}
/**
* Test of makeMove method, of class Position.
*/
public void testMakeMove() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
Position origPos = new Position(pos);
@ -172,9 +160,6 @@ public class PositionTest extends TestCase {
assertTrue(pos.equals(origPos2));
}
/**
* Test of makeMove method, of class Position.
*/
public void testPromotion() throws ChessParseError {
String fen = "r1bqk2r/1Pppbppp/p1n2n2/2P1p3/B3P3/5N2/Pp1P1PPP/R1BQK2R w KQkq - 0 1";
Position pos = TextIO.readFEN(fen);
@ -210,9 +195,6 @@ public class PositionTest extends TestCase {
assertEquals(origPos, pos);
}
/**
* Test move counters, of class Position.
*/
public void testMoveCounters() throws ChessParseError {
String fen = "r1bqk2r/2ppbppp/p1n2n2/1pP1p3/B3P3/5N2/PP1P1PPP/RNBQK2R w KQkq b6 0 7";
Position pos = TextIO.readFEN(fen);
@ -272,9 +254,6 @@ public class PositionTest extends TestCase {
assertEquals(69, pos.fullMoveCounter);
}
/**
* Test of drawRuleEquals, of class Position.
*/
public void testDrawRuleEquals() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
Position origPos = new Position(pos);
@ -315,9 +294,6 @@ public class PositionTest extends TestCase {
assertEquals(false, pos.drawRuleEquals(origPos)); // Not equal, en passant rights lost
}
/**
* Test of hashCode method, of class Position.
*/
public void testHashCode() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
long h1 = pos.zobristHash();
@ -369,9 +345,6 @@ public class PositionTest extends TestCase {
}
}
/**
* Test of getKingSq method, of class Position.
*/
public void testGetKingSq() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
assertEquals(TextIO.getSquare("e1"), pos.getKingSq(true));

27
DroidFishApp/src/androidTest/java/org/petero/droidfish/gamelogic/TextIOTest.java
View File

@ -26,9 +26,6 @@ public class TextIOTest extends TestCase {
public TextIOTest() {
}
/**
* Test of readFEN method, of class TextIO.
*/
public void testReadFEN() throws ChessParseError {
String fen = "rnbqk2r/1p3ppp/p7/1NpPp3/QPP1P1n1/P4N2/4KbPP/R1B2B1R b kq - 0 1";
Position pos = TextIO.readFEN(fen);
@ -119,9 +116,6 @@ public class TextIOTest extends TestCase {
assertTrue(pos.equals(TextIO.readFEN("rnbqkbnr/pp1ppppp/8/8/2pPP3/3P4/PP3PPP/RNBQKBNR b KQkq - 0 1")));
}
/**
* Test that readFEN removes bogus castle flags.
*/
public void testReadFENCastleFlags() throws ChessParseError {
String fenBogus = "rnbqk2r/1p3ppp/p7/1NpPp3/QPP1P1n1/P4N2/4KbPP/R1B2B1R w KQkq - 0 1";
Position pos = TextIO.readFEN(fenBogus);
@ -145,9 +139,6 @@ public class TextIOTest extends TestCase {
return TextIO.moveToString(pos, move, longForm, false);
}
/**
* Test of moveToString method, of class TextIO.
*/
public void testMoveToString() throws ChessParseError {
Position pos = TextIO.readFEN(TextIO.startPosFEN);
assertEquals(TextIO.startPosFEN, TextIO.toFEN(pos));
@ -190,9 +181,6 @@ public class TextIOTest extends TestCase {
assertEquals("--", result);
}
/**
* Test of moveToString method, of class TextIO, mate/stalemate tests.
*/
public void testMoveToStringMate() throws ChessParseError {
Position pos = TextIO.readFEN("3k4/1PR5/3N4/8/4K3/8/8/8 w - - 0 1");
boolean longForm = true;
@ -214,9 +202,6 @@ public class TextIOTest extends TestCase {
assertEquals("b7-b8B", result); // stalemate
}
/**
* Test of moveToString method, of class TextIO, short form.
*/
public void testMoveToStringShortForm() throws ChessParseError {
String fen = "r4rk1/2pn3p/2q1q1n1/8/2q2p2/6R1/p4PPP/1R4K1 b - - 0 1";
Position pos = TextIO.readFEN(fen);
@ -264,9 +249,6 @@ public class TextIOTest extends TestCase {
assertEquals("Rfd8", result); // File disambiguation needed
}
/**
* Test of stringToMove method, of class TextIO.
*/
public void testStringToMove() throws ChessParseError {
Position pos = TextIO.readFEN("r4rk1/2pn3p/2q1q1n1/8/2q2p2/6R1/p4PPP/1R4K1 b - - 0 1");
@ -369,9 +351,6 @@ public class TextIOTest extends TestCase {
assertEquals(mNf3, TextIO.stringToMove(pos, "Nf"));
}
/**
* Test of getSquare method, of class TextIO.
*/
public void testGetSquare() throws ChessParseError {
assertEquals(Position.getSquare(0, 0), TextIO.getSquare("a1"));
assertEquals(Position.getSquare(1, 7), TextIO.getSquare("b8"));
@ -381,18 +360,12 @@ public class TextIOTest extends TestCase {
assertEquals(Position.getSquare(7, 7), TextIO.getSquare("h8"));
}
/**
* Test of squareToString method, of class TextIO.
*/
public void testSquareToString() {
assertEquals("a1", TextIO.squareToString(Position.getSquare(0, 0)));
assertEquals("h6", TextIO.squareToString(Position.getSquare(7, 5)));
assertEquals("e4", TextIO.squareToString(Position.getSquare(4, 3)));
}
/**
* Test of asciiBoard method, of class TextIO.
*/
public void testAsciiBoard() throws ChessParseError {
Position pos = TextIO.readFEN("r4rk1/2pn3p/2q1q1n1/8/2q2p2/6R1/p4PPP/1R4K1 b - - 0 1");
String aBrd = TextIO.asciiBoard(pos);

4
DroidFishApp/src/main/java/org/petero/droidfish/ColorTheme.java
View File

@ -120,8 +120,8 @@ public class ColorTheme {
colorTable[i] = 0;
try {
colorTable[i] = Color.parseColor(colorString);
} catch (IllegalArgumentException e) {
} catch (StringIndexOutOfBoundsException e) {
} catch (IllegalArgumentException ignore) {
} catch (StringIndexOutOfBoundsException ignore) {
}
}
}

36
DroidFishApp/src/main/java/org/petero/droidfish/DroidFish.java
View File

@ -1592,7 +1592,7 @@ public class DroidFish extends Activity
if (lines.length >= 3)
id = lines[1] + ":" + lines[2];
}
} catch (IOException e) {
} catch (IOException ignore) {
}
engineOptions.networkID = id;
}
@ -1783,7 +1783,7 @@ public class DroidFish extends Activity
String fen = data.getAction();
ctrl.setFENOrPGN(fen);
setBoardFlip(false);
} catch (ChessParseError e) {
} catch (ChessParseError ignore) {
}
}
break;
@ -1830,7 +1830,7 @@ public class DroidFish extends Activity
if (pathName != null) {
if ((pathName.length() > 0) && !pathName.contains("."))
pathName += ".pgn";
savePGNToFile(pathName, false);
savePGNToFile(pathName);
}
}
break;
@ -2350,8 +2350,8 @@ public class DroidFish extends Activity
}
case PASTE: {
ClipboardManager clipboard = (ClipboardManager)getSystemService(CLIPBOARD_SERVICE);
if (clipboard.hasPrimaryClip()) {
ClipData clip = clipboard.getPrimaryClip();
ClipData clip = clipboard.getPrimaryClip();
if (clip != null) {
StringBuilder fenPgn = new StringBuilder();
for (int i = 0; i < clip.getItemCount(); i++)
fenPgn.append(clip.getItemAt(i).coerceToText(getApplicationContext()));
@ -2458,7 +2458,7 @@ public class DroidFish extends Activity
try {
startActivity(Intent.createChooser(i, getString(game ? R.string.share_game :
R.string.share_text)));
} catch (ActivityNotFoundException ex) {
} catch (ActivityNotFoundException ignore) {
}
}
@ -2493,7 +2493,7 @@ public class DroidFish extends Activity
i.setType("image/png");
try {
startActivity(Intent.createChooser(i, getString(R.string.share_image)));
} catch (ActivityNotFoundException ex) {
} catch (ActivityNotFoundException ignore) {
}
}
@ -2575,12 +2575,12 @@ public class DroidFish extends Activity
String data = FileUtil.readFromStream(is);
if (data == null)
data = "";
try { is.close(); } catch (IOException e1) {}
try { is.close(); } catch (IOException ignore) {}
wv.loadDataWithBaseURL(null, data, "text/html", "utf-8", null);
try {
PackageInfo pi = getPackageManager().getPackageInfo("org.petero.droidfish", 0);
title += " " + pi.versionName;
} catch (NameNotFoundException e) {
} catch (NameNotFoundException ignore) {
}
builder.setTitle(title);
return builder.create();
@ -2812,7 +2812,7 @@ public class DroidFish extends Activity
pgnFile = fileNames[item];
String sep = File.separator;
String pathName = Environment.getExternalStorageDirectory() + sep + pgnDir + sep + pgnFile;
savePGNToFile(pathName, false);
savePGNToFile(pathName);
}
}
});
@ -2834,7 +2834,7 @@ public class DroidFish extends Activity
pgnFile += ".pgn";
String sep = File.separator;
String pathName = Environment.getExternalStorageDirectory() + sep + pgnDir + sep + pgnFile;
savePGNToFile(pathName, false);
savePGNToFile(pathName);
}
};
builder.setPositiveButton(android.R.string.ok, new Dialog.OnClickListener() {
@ -3239,7 +3239,7 @@ public class DroidFish extends Activity
seekBar.setProgress(p);
updateText(editTxt, progressToNumPV(p, maxPV));
} catch (NumberFormatException ex) {
} catch (NumberFormatException ignore) {
}
}
@Override
@ -3560,7 +3560,7 @@ public class DroidFish extends Activity
if (lines.length > 2)
port = lines[2];
}
} catch (IOException e1) {
} catch (IOException ignore) {
}
hostNameView.setText(hostName);
portView.setText(port);
@ -3776,7 +3776,7 @@ public class DroidFish extends Activity
}
/** Save current game to a PGN file. */
private void savePGNToFile(String pathName, boolean silent) {
private void savePGNToFile(String pathName) {
String pgn = ctrl.getPGN();
String pgnToken = cache.storeString(pgn);
Editor editor = settings.edit();
@ -3787,7 +3787,7 @@ public class DroidFish extends Activity
i.setAction("org.petero.droidfish.saveFile");
i.putExtra("org.petero.droidfish.pathname", pathName);
i.putExtra("org.petero.droidfish.pgn", pgnToken);
i.putExtra("org.petero.droidfish.silent", silent);
i.putExtra("org.petero.droidfish.silent", false);
startActivity(i);
}
@ -3881,7 +3881,7 @@ public class DroidFish extends Activity
moveSound = MediaPlayer.create(this, R.raw.movesound);
if (moveSound != null)
moveSound.start();
} catch (NotFoundException ex) {
} catch (NotFoundException ignore) {
}
}
} else if (moveAnnounceType.startsWith("speech_")) {
@ -3915,8 +3915,8 @@ public class DroidFish extends Activity
return;
notificationActive = show;
final int cpuUsage = 1;
String ns = Context.NOTIFICATION_SERVICE;
NotificationManager mNotificationManager = (NotificationManager)getSystemService(ns);
NotificationManager mNotificationManager =
(NotificationManager)getSystemService(Context.NOTIFICATION_SERVICE);
if (show) {
boolean silhouette = Build.VERSION.SDK_INT >= 21;
int icon = silhouette ? R.drawable.silhouette : R.mipmap.icon;

4
DroidFishApp/src/main/java/org/petero/droidfish/GUIInterface.java
View File

@ -33,7 +33,7 @@ public interface GUIInterface {
/** Mark square sq as selected. Set to -1 to clear selection. */
void setSelection(int sq);
final static class GameStatus {
final class GameStatus {
public Game.GameState state = Game.GameState.ALIVE;
public int moveNr = 0;
/** Move required to claim draw, or empty string. */
@ -50,7 +50,7 @@ public interface GUIInterface {
/** Update the list of moves. */
void moveListUpdated();
final public static class ThinkingInfo {
final class ThinkingInfo {
public int id;
public String pvStr;
public String statStr;

6
DroidFishApp/src/main/java/org/petero/droidfish/ObjectCache.java
View File

@ -117,7 +117,7 @@ public class ObjectCache {
try {
tokens[i] = Long.valueOf(files[i].getName());
token = Math.max(token, tokens[i]);
} catch (NumberFormatException nfe) {
} catch (NumberFormatException ignore) {
}
}
Arrays.sort(tokens);
@ -140,7 +140,7 @@ public class ObjectCache {
}
}
}
} catch (IOException e) {
} catch (IOException ignore) {
}
}
return -1;
@ -167,7 +167,7 @@ public class ObjectCache {
} finally {
raf.close();
}
} catch (IOException ex) {
} catch (IOException ignore) {
}
}
return null;

2
DroidFishApp/src/main/java/org/petero/droidfish/Speech.java
View File

@ -105,7 +105,7 @@ public class Speech {
}
@SuppressWarnings("deprecation")
public void say(String text) {
private void say(String text) {
if (initialized) {
if (lang != Language.NONE && text != null) {
if (!tts.isSpeaking())

12
DroidFishApp/src/main/java/org/petero/droidfish/activities/BufferedRandomAccessFileReader.java
View File

@ -22,11 +22,11 @@ import java.io.IOException;
import java.io.RandomAccessFile;
final class BufferedRandomAccessFileReader {
RandomAccessFile f;
byte[] buffer = new byte[8192];
long bufStartFilePos = 0;
int bufLen = 0;
int bufPos = 0;
private RandomAccessFile f;
private byte[] buffer = new byte[8192];
private long bufStartFilePos = 0;
private int bufLen = 0;
private int bufPos = 0;
BufferedRandomAccessFileReader(String fileName) throws FileNotFoundException {
f = new RandomAccessFile(fileName, "r");
@ -34,7 +34,7 @@ final class BufferedRandomAccessFileReader {
final long length() throws IOException {
return f.length();
}
final long getFilePointer() throws IOException {
final long getFilePointer() {
return bufStartFilePos + bufPos;
}
final void close() throws IOException {

29
DroidFishApp/src/main/java/org/petero/droidfish/activities/EditBoard.java
View File

@ -81,8 +81,6 @@ import android.widget.Toast;
public class EditBoard extends Activity {
private ChessBoardEdit cb;
private TextView status;
private Button okButton;
private Button cancelButton;
private boolean egtbHints;
private boolean autoScrollTitle;
@ -111,7 +109,7 @@ public class EditBoard extends Activity {
Util.setFullScreenMode(this, settings);
Intent i = getIntent();
Position pos = null;
Position pos;
try {
pos = TextIO.readFEN(i.getAction());
} catch (ChessParseError e) {
@ -147,8 +145,8 @@ public class EditBoard extends Activity {
cb = findViewById(R.id.eb_chessboard);
cb.setFlipped(boardFlipped);
status = findViewById(R.id.eb_status);
okButton = findViewById(R.id.eb_ok);
cancelButton = findViewById(R.id.eb_cancel);
Button okButton = findViewById(R.id.eb_ok);
Button cancelButton = findViewById(R.id.eb_cancel);
TextView whiteTitleText = findViewById(R.id.white_clock);
whiteTitleText.setVisibility(View.GONE);
@ -258,9 +256,9 @@ public class EditBoard extends Activity {
class DrawerItem {
int id;
int itemId; // Item string resource id
private int itemId; // Item string resource id
DrawerItem(int id, int itemId) {
private DrawerItem(int id, int itemId) {
this.id = id;
this.itemId = itemId;
}
@ -322,7 +320,7 @@ public class EditBoard extends Activity {
cb.setPosition(pos);
setSelection(-1);
checkValidAndUpdateMaterialDiff();
} catch (ChessParseError e) {
} catch (ChessParseError ignore) {
}
break;
}
@ -353,8 +351,8 @@ public class EditBoard extends Activity {
}
case PASTE_POSITION: {
ClipboardManager clipboard = (ClipboardManager)getSystemService(CLIPBOARD_SERVICE);
if (clipboard.hasPrimaryClip()) {
ClipData clip = clipboard.getPrimaryClip();
ClipData clip = clipboard.getPrimaryClip();
if (clip != null) {
if (clip.getItemCount() > 0) {
String fen = clip.getItemAt(0).coerceToText(getApplicationContext()).toString();
setFEN(fen);
@ -413,7 +411,7 @@ public class EditBoard extends Activity {
}
}
Position pos = new Position(cb.pos);
int piece = Piece.EMPTY;
int piece;
if (m.from >= 0) {
piece = pos.getPiece(m.from);
} else {
@ -534,8 +532,7 @@ public class EditBoard extends Activity {
}
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case CASTLE_DIALOG: {
final CharSequence[] items = {
@ -572,8 +569,7 @@ public class EditBoard extends Activity {
checkValidAndUpdateMaterialDiff();
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case EP_DIALOG: {
final CharSequence[] items = {
@ -587,8 +583,7 @@ public class EditBoard extends Activity {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case MOVCNT_DIALOG: {
View content = View.inflate(this, R.layout.edit_move_counters, null);

2
DroidFishApp/src/main/java/org/petero/droidfish/activities/EditOptions.java
View File

@ -139,7 +139,7 @@ public class EditOptions extends Activity {
so.set(so.maxValue);
else
so.set(newVal);
} catch (NumberFormatException ex) {
} catch (NumberFormatException ignore) {
}
}
});

21
DroidFishApp/src/main/java/org/petero/droidfish/activities/EditPGN.java
View File

@ -58,7 +58,7 @@ import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener;
public class EditPGN extends ListActivity {
public abstract class EditPGN extends ListActivity {
static ArrayList<GameInfo> gamesInFile = new ArrayList<>();
static boolean cacheValid = false;
PGNFile pgnFile;
@ -105,7 +105,7 @@ public class EditPGN extends ListActivity {
String action = i.getAction();
String fileName = i.getStringExtra("org.petero.droidfish.pathname");
canceled = false;
if (action.equals("org.petero.droidfish.loadFile")) {
if ("org.petero.droidfish.loadFile".equals(action)) {
pgnFile = new PGNFile(fileName);
loadGame = true;
showDialog(PROGRESS_DIALOG);
@ -127,8 +127,8 @@ public class EditPGN extends ListActivity {
}
});
workThread.start();
} else if (action.equals("org.petero.droidfish.loadFileNextGame") ||
action.equals("org.petero.droidfish.loadFilePrevGame")) {
} else if ("org.petero.droidfish.loadFileNextGame".equals(action) ||
"org.petero.droidfish.loadFilePrevGame".equals(action)) {
pgnFile = new PGNFile(fileName);
loadGame = true;
boolean next = action.equals("org.petero.droidfish.loadFileNextGame");
@ -158,7 +158,7 @@ public class EditPGN extends ListActivity {
});
workThread.start();
}
} else if (action.equals("org.petero.droidfish.saveFile")) {
} else if ("org.petero.droidfish.saveFile".equals(action)) {
loadGame = false;
String token = i.getStringExtra("org.petero.droidfish.pgn");
pgnToSave = (new ObjectCache()).retrieveString(token);
@ -223,7 +223,7 @@ public class EditPGN extends ListActivity {
workThread.interrupt();
try {
workThread.join();
} catch (InterruptedException e) {
} catch (InterruptedException ignore) {
}
workThread = null;
}
@ -365,8 +365,7 @@ public class EditPGN extends ListActivity {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case SAVE_GAME_DIALOG: {
final GameInfo gi = selectedGi;
@ -394,8 +393,7 @@ public class EditPGN extends ListActivity {
finish();
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
case DELETE_PGN_FILE_DIALOG: {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
@ -414,8 +412,7 @@ public class EditPGN extends ListActivity {
dialog.cancel();
}
});
AlertDialog alert = builder.create();
return alert;
return builder.create();
}
default:
return null;

2
DroidFishApp/src/main/java/org/petero/droidfish/activities/FENFile.java
View File

@ -97,7 +97,7 @@ public class FENFile {
return new Pair<>(FenInfoResult.CANCEL, null);
}
f.close();
} catch (IOException e) {
} catch (IOException ignore) {
} catch (OutOfMemoryError e) {
fensInFile.clear();
fensInFile = null;

9
DroidFishApp/src/main/java/org/petero/droidfish/activities/LoadFEN.java
View File

@ -78,7 +78,6 @@ public class LoadFEN extends ListActivity {
private ChessBoardPlay cb;
private Button okButton;
private Button cancelButton;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -101,7 +100,7 @@ public class LoadFEN extends ListActivity {
Intent i = getIntent();
String action = i.getAction();
String fileName = i.getStringExtra("org.petero.droidfish.pathname");
if (action.equals("org.petero.droidfish.loadFen")) {
if ("org.petero.droidfish.loadFen".equals(action)) {
fenFile = new FENFile(fileName);
progressLatch = new CountDownLatch(1);
showProgressDialog();
@ -130,8 +129,8 @@ public class LoadFEN extends ListActivity {
}
});
workThread.start();
} else if (action.equals("org.petero.droidfish.loadNextFen") ||
action.equals("org.petero.droidfish.loadPrevFen")) {
} else if ("org.petero.droidfish.loadNextFen".equals(action) ||
"org.petero.droidfish.loadPrevFen".equals(action)) {
fenFile = new FENFile(fileName);
boolean next = action.equals("org.petero.droidfish.loadNextFen");
final int loadItem = defaultItem + (next ? 1 : -1);
@ -204,7 +203,7 @@ public class LoadFEN extends ListActivity {
cb = findViewById(R.id.loadfen_chessboard);
okButton = findViewById(R.id.loadfen_ok);
cancelButton = findViewById(R.id.loadfen_cancel);
Button cancelButton = findViewById(R.id.loadfen_cancel);
okButton.setEnabled(false);
okButton.setOnClickListener(new OnClickListener() {

10
DroidFishApp/src/main/java/org/petero/droidfish/activities/LoadScid.java
View File

@ -135,7 +135,7 @@ public class LoadScid extends ListActivity {
fileName = i.getStringExtra("org.petero.droidfish.pathname");
resultSentBack = false;
canceled = false;
if (action.equals("org.petero.droidfish.loadScid")) {
if ("org.petero.droidfish.loadScid".equals(action)) {
progressLatch = new CountDownLatch(1);
showProgressDialog();
final LoadScid lpgn = this;
@ -163,8 +163,8 @@ public class LoadScid extends ListActivity {
});
}
});
} else if (action.equals("org.petero.droidfish.loadScidNextGame") ||
action.equals("org.petero.droidfish.loadScidPrevGame")) {
} else if ("org.petero.droidfish.loadScidNextGame".equals(action) ||
"org.petero.droidfish.loadScidPrevGame".equals(action)) {
boolean next = action.equals("org.petero.droidfish.loadScidNextGame");
final int loadItem = defaultItem + (next ? 1 : -1);
if (loadItem < 0) {
@ -222,7 +222,7 @@ public class LoadScid extends ListActivity {
workThread.interrupt();
try {
workThread.join();
} catch (InterruptedException e) {
} catch (InterruptedException ignore) {
}
workThread = null;
}
@ -319,7 +319,7 @@ public class LoadScid extends ListActivity {
}
addGameInfo(cursor);
gameNo++;
final int newPercent = (int)(gameNo * 100 / noGames);
final int newPercent = gameNo * 100 / noGames;
if (newPercent > percent) {
percent = newPercent;
if (progress != null) {

10
DroidFishApp/src/main/java/org/petero/droidfish/activities/PGNFile.java
View File

@ -154,7 +154,7 @@ public class PGNFile {
public void close() {
try {
is.close();
} catch (IOException ex) {
} catch (IOException ignore) {
}
}
}
@ -364,7 +364,7 @@ public class PGNFile {
gi.info = hi.toString();
gamesInFile.add(gi);
}
} catch (IOException e) {
} catch (IOException ignore) {
} catch (OutOfMemoryError e) {
gamesInFile.clear();
gamesInFile = null;
@ -393,7 +393,7 @@ public class PGNFile {
f.readFully(pgnData);
f.close();
return new String(pgnData);
} catch (IOException e) {
} catch (IOException ignore) {
}
return null;
}
@ -444,7 +444,7 @@ public class PGNFile {
return false;
}
final boolean replacePGN(String pgnToSave, GameInfo gi) {
final void replacePGN(String pgnToSave, GameInfo gi) {
try {
File tmpFile = new File(fileName + ".tmp_delete");
RandomAccessFile fileReader = new RandomAccessFile(fileName, "r");
@ -458,11 +458,9 @@ public class PGNFile {
if (!tmpFile.renameTo(fileName))
throw new IOException();
DroidFishApp.toast(R.string.game_saved, Toast.LENGTH_SHORT);
return true;
} catch (IOException e) {
DroidFishApp.toast(R.string.failed_to_save_game, Toast.LENGTH_SHORT);
}
return false;
}
private static void copyData(RandomAccessFile fileReader,

2
DroidFishApp/src/main/java/org/petero/droidfish/activities/SeekBarPreference.java
View File

@ -151,7 +151,7 @@ public class SeekBarPreference extends Preference
if (value < 0) value = 0;
if (value > maxValue) value = maxValue;
onProgressChanged(bar, value, false);
} catch (NumberFormatException nfe) {
} catch (NumberFormatException ignore) {
}
}
};

20
DroidFishApp/src/main/java/org/petero/droidfish/book/CtgBook.java
View File

@ -120,9 +120,9 @@ class CtgBook implements IOpeningBook {
} catch (IOException e) {
return null;
} finally {
if (ctgF != null) try { ctgF.close(); } catch (IOException e) { }
if (ctbF != null) try { ctbF.close(); } catch (IOException e) { }
if (ctoF != null) try { ctoF.close(); } catch (IOException e) { }
if (ctgF != null) try { ctgF.close(); } catch (IOException ignore) { }
if (ctbF != null) try { ctbF.close(); } catch (IOException ignore) { }
if (ctoF != null) try { ctoF.close(); } catch (IOException ignore) { }
}
}
@ -163,7 +163,7 @@ class CtgBook implements IOpeningBook {
int byteIdx = length / 8;
int bitIdx = 7 - (length & 7);
while (buf.size() <= byteIdx)
buf.add(Byte.valueOf((byte)0));
buf.add((byte)0);
if (value)
buf.set(byteIdx, (byte)(buf.get(byteIdx) | (1 << bitIdx)));
length++;
@ -266,8 +266,7 @@ class CtgBook implements IOpeningBook {
final int getPage(int hashIndex) throws IOException {
byte[] buf = readBytes(f, 16 + 4 * hashIndex, 4);
int page = extractInt(buf, 0, 4);
return page;
return extractInt(buf, 0, 4);
}
private final static int tbl[] = {
@ -292,8 +291,7 @@ class CtgBook implements IOpeningBook {
private static int getHashValue(byte[] encodedPos) {
int hash = 0;
int tmp = 0;
for (int i = 0; i < encodedPos.length; i++) {
int ch = encodedPos[i];
for (int ch : encodedPos) {
tmp += ((0x0f - (ch & 0x0f)) << 2) + 1;
hash += tbl[tmp & 0x3f];
tmp += ((0xf0 - (ch & 0xf0)) >> 2) + 1;
@ -437,8 +435,7 @@ class CtgBook implements IOpeningBook {
final int getRecommendation() {
int statStart = posLen + moveBytes;
int recom = extractInt(buf, statStart + 30, 1);
return recom;
return extractInt(buf, statStart + 30, 1);
}
private static final class MoveInfo {
@ -651,8 +648,7 @@ class CtgBook implements IOpeningBook {
int promoteTo = Piece.EMPTY;
if ((pos.getPiece(from) == Piece.WPAWN) && (toY == 7))
promoteTo = Piece.WQUEEN;
Move m = new Move(from, to, promoteTo);
return m;
return new Move(from, to, promoteTo);
}
}

10
DroidFishApp/src/main/java/org/petero/droidfish/book/EcoDb.java
View File

@ -19,6 +19,7 @@
package org.petero.droidfish.book;
import android.annotation.SuppressLint;
import android.text.style.TabStopSpan;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -254,8 +255,6 @@ public class EcoDb {
try {
ByteArrayOutputStream bufStream = new ByteArrayOutputStream();
InputStream inStream = DroidFishApp.getContext().getAssets().open("eco.dat");
if (inStream == null)
throw new IOException("Can't read ECO database");
byte[] buf = new byte[1024];
while (true) {
int len = inStream.read(buf);
@ -365,8 +364,8 @@ public class EcoDb {
private int maxSize;
public WeakLRUCache(int maxSize) {
mapNew = new WeakHashMap<K, V>();
mapOld = new WeakHashMap<K, V>();
mapNew = new WeakHashMap<>();
mapOld = new WeakHashMap<>();
this.maxSize = maxSize;
}
@ -375,8 +374,7 @@ public class EcoDb {
if (mapNew.containsKey(key)) {
mapNew.put(key, val);
} else {
if (mapOld.containsKey(key))
mapOld.remove(key);
mapOld.remove(key);
insertNew(key, val);
}
}

4
DroidFishApp/src/main/java/org/petero/droidfish/book/InternalBook.java
View File

@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import org.petero.droidfish.DroidFishApp;
import org.petero.droidfish.book.DroidBook.BookEntry;
import org.petero.droidfish.gamelogic.ChessParseError;
import org.petero.droidfish.gamelogic.Move;
@ -34,7 +33,6 @@ import org.petero.droidfish.gamelogic.TextIO;
import org.petero.droidfish.gamelogic.UndoInfo;
import android.annotation.SuppressLint;
import android.widget.Toast;
@SuppressLint("UseSparseArrays")
final class InternalBook implements IOpeningBook {
@ -78,7 +76,7 @@ final class InternalBook implements IOpeningBook {
enabled = options.filename.equals("internal:");
}
private synchronized final void initInternalBook() {
private synchronized void initInternalBook() {
if (numBookMoves >= 0)
return;
// long t0 = System.currentTimeMillis();

13
DroidFishApp/src/main/java/org/petero/droidfish/engine/DroidComputerPlayer.java
View File

@ -53,7 +53,7 @@ public class DroidComputerPlayer {
private String engineName = "Computer";
/** Engine state. */
private static enum MainState {
private enum MainState {
READ_OPTIONS, // "uci" command sent, waiting for "option" and "uciok" response.
WAIT_READY, // "isready" sent, waiting for "readyok".
IDLE, // engine not searching.
@ -138,7 +138,6 @@ public class DroidComputerPlayer {
* Create a search request object.
* @param id Search ID.
* @param now Current system time.
* @param pos An earlier position from the game.
* @param mList List of moves to go from the earlier position to the current position.
* This list makes it possible for the computer to correctly handle draw
* by repetition/50 moves.
@ -406,7 +405,7 @@ public class DroidComputerPlayer {
// If we have a book move, play it.
Move bookMove = book.getBookMove(sr.currPos);
if (bookMove != null) {
if (canClaimDraw(sr.currPos, posHashList, posHashListSize, bookMove) == "") {
if (canClaimDraw(sr.currPos, posHashList, posHashListSize, bookMove).isEmpty()) {
listener.notifySearchResult(sr.searchId,
TextIO.moveToString(sr.currPos, bookMove, false, false),
null);
@ -422,7 +421,7 @@ public class DroidComputerPlayer {
}
if (moves.size() == 1) {
Move bestMove = moves.get(0);
if (canClaimDraw(sr.currPos, posHashList, posHashListSize, bestMove) == "") {
if (canClaimDraw(sr.currPos, posHashList, posHashListSize, bestMove).isEmpty()) {
listener.notifySearchResult(sr.searchId, TextIO.moveToUCIString(bestMove), null);
return;
}
@ -497,7 +496,7 @@ public class DroidComputerPlayer {
}
/** Type of search the engine is currently requested to perform. */
public static enum SearchType {
public enum SearchType {
NONE,
SEARCH,
PONDER,
@ -807,7 +806,7 @@ public class DroidComputerPlayer {
if (statScore <= 0) {
String drawClaim = canClaimDraw(sr.currPos, sr.posHashList, sr.posHashListSize,
TextIO.UCIstringToMove(bestMove));
if (drawClaim != "") {
if (!drawClaim.isEmpty()) {
bestMove = drawClaim;
canPonder = false;
}
@ -820,7 +819,7 @@ public class DroidComputerPlayer {
if (canPonder) {
Move bestM = TextIO.stringToMove(sr.currPos, bestMove);
if ((bestM == null) || !TextIO.isValid(sr.currPos, bestM))
if (!TextIO.isValid(sr.currPos, bestM))
canPonder = false;
if (canPonder) {
Position tmpPos = new Position(sr.currPos);

2
DroidFishApp/src/main/java/org/petero/droidfish/engine/EngineUtil.java
View File

@ -54,7 +54,7 @@ public class EngineUtil {
if ((inFile.read(buf) == 4) && "NETE".equals(new String(buf)))
netEngine = true;
inFile.close();
} catch (IOException e) {
} catch (IOException ignore) {
}
return netEngine;
}

20
DroidFishApp/src/main/java/org/petero/droidfish/engine/ExternalEngine.java
View File

@ -43,7 +43,7 @@ public class ExternalEngine extends UCIEngineBase {
private Thread exitThread;
private Thread stdInThread;
private Thread stdErrThread;
private LocalPipe inLines;
private final LocalPipe inLines;
private boolean startedOk;
private boolean isRunning;
@ -107,7 +107,7 @@ public class ExternalEngine extends UCIEngineBase {
else {
report.reportError(context.getString(R.string.engine_terminated));
}
} catch (InterruptedException e) {
} catch (InterruptedException ignore) {
}
}
});
@ -127,7 +127,7 @@ public class ExternalEngine extends UCIEngineBase {
try {
boolean first = true;
while ((line = br.readLine()) != null) {
if ((ep == null) || Thread.currentThread().isInterrupted())
if (Thread.currentThread().isInterrupted())
return;
synchronized (inLines) {
inLines.addLine(line);
@ -138,7 +138,7 @@ public class ExternalEngine extends UCIEngineBase {
}
}
}
} catch (IOException e) {
} catch (IOException ignore) {
}
inLines.close();
}
@ -177,7 +177,7 @@ public class ExternalEngine extends UCIEngineBase {
f.setAccessible(true);
int pid = f.getInt(engineProc);
EngineUtil.reNice(pid, 10);
} catch (Throwable t) {
} catch (Throwable ignore) {
}
}
@ -193,7 +193,7 @@ public class ExternalEngine extends UCIEngineBase {
f.delete();
}
new File(context.getFilesDir(), "engine.exe").delete();
} catch (IOException e) {
} catch (IOException ignore) {
}
}
@ -276,7 +276,7 @@ public class ExternalEngine extends UCIEngineBase {
ep.getOutputStream().write(data.getBytes());
ep.getOutputStream().flush();
}
} catch (IOException e) {
} catch (IOException ignore) {
}
}
@ -294,7 +294,7 @@ public class ExternalEngine extends UCIEngineBase {
engineProc.exitValue();
break;
} catch (IllegalThreadStateException e) {
try { Thread.sleep(10); } catch (InterruptedException e2) { }
try { Thread.sleep(10); } catch (InterruptedException ignore) { }
}
}
engineProc.destroy();
@ -325,8 +325,8 @@ public class ExternalEngine extends UCIEngineBase {
if (cnt < inFC.size())
throw new IOException("File copy failed");
} finally {
if (fis != null) { try { fis.close(); } catch (IOException ex) {} }
if (fos != null) { try { fos.close(); } catch (IOException ex) {} }
if (fis != null) { try { fis.close(); } catch (IOException ignore) {} }
if (fos != null) { try { fos.close(); } catch (IOException ignore) {} }
to.setLastModified(from.lastModified());
}
return to.getAbsolutePath();

10
DroidFishApp/src/main/java/org/petero/droidfish/engine/InternalStockFish.java
View File

@ -71,7 +71,7 @@ public class InternalStockFish extends ExternalEngine {
} catch (IOException e) {
return 0;
} finally {
if (is != null) try { is.close(); } catch (IOException ex) {}
if (is != null) try { is.close(); } catch (IOException ignore) {}
}
}
@ -83,7 +83,7 @@ public class InternalStockFish extends ExternalEngine {
dos.writeLong(checkSum);
} catch (IOException e) {
} finally {
if (dos != null) try { dos.close(); } catch (IOException ex) {}
if (dos != null) try { dos.close(); } catch (IOException ignore) {}
}
}
@ -110,7 +110,7 @@ public class InternalStockFish extends ExternalEngine {
} catch (NoSuchAlgorithmException e) {
return -1;
} finally {
if (is != null) try { is.close(); } catch (IOException ex) {}
if (is != null) try { is.close(); } catch (IOException ignore) {}
}
}
@ -142,8 +142,8 @@ public class InternalStockFish extends ExternalEngine {
os.write(buf, 0, len);
}
} finally {
if (is != null) try { is.close(); } catch (IOException ex) {}
if (os != null) try { os.close(); } catch (IOException ex) {}
if (is != null) try { is.close(); } catch (IOException ignore) {}
if (os != null) try { os.close(); } catch (IOException ignore) {}
}
writeCheckSum(new File(internalSFPath()), newCSum);

2
DroidFishApp/src/main/java/org/petero/droidfish/engine/LocalPipe.java
View File

@ -42,7 +42,7 @@ public class LocalPipe {
while (lines.size() > 10000) {
try {
wait(10);
} catch (InterruptedException e) {
} catch (InterruptedException ignore) {
}
}
lines.add(line);

12
DroidFishApp/src/main/java/org/petero/droidfish/engine/NetworkEngine.java
View File

@ -44,8 +44,8 @@ public class NetworkEngine extends UCIEngineBase {
private Thread startupThread;
private Thread stdInThread;
private Thread stdOutThread;
private LocalPipe guiToEngine;
private LocalPipe engineToGui;
private final LocalPipe guiToEngine;
private final LocalPipe engineToGui;
private boolean startedOk;
private boolean isRunning;
private boolean isError;
@ -78,7 +78,7 @@ public class NetworkEngine extends UCIEngineBase {
port = lines[2];
ok = true;
}
} catch (IOException e1) {
} catch (IOException ignore) {
}
}
if (!ok) {
@ -151,7 +151,7 @@ public class NetworkEngine extends UCIEngineBase {
}
}
}
} catch (IOException e) {
} catch (IOException ignore) {
} finally {
if (isRunning) {
isError = true;
@ -191,8 +191,8 @@ public class NetworkEngine extends UCIEngineBase {
report.reportError(context.getString(R.string.engine_terminated));
}
isRunning = false;
try { socket.getOutputStream().write("quit\n".getBytes()); } catch (IOException e) {}
try { socket.close(); } catch (IOException ex) {}
try { socket.getOutputStream().write("quit\n".getBytes()); } catch (IOException ignore) {}
try { socket.close(); } catch (IOException ignore) {}
}
}
});

14
DroidFishApp/src/main/java/org/petero/droidfish/engine/UCIEngineBase.java
View File

@ -40,7 +40,7 @@ public abstract class UCIEngineBase implements UCIEngine {
public static UCIEngine getEngine(String engine,
EngineOptions engineOptions, Report report) {
if ("cuckoochess".equals(engine))
return new CuckooChessEngine(report);
return new CuckooChessEngine();
else if ("stockfish".equals(engine))
return new InternalStockFish(report);
else if (EngineUtil.isOpenExchangeEngine(engine))
@ -80,10 +80,10 @@ public abstract class UCIEngineBase implements UCIEngine {
try {
is = new FileInputStream(optionsFile);
iniOptions.load(is);
} catch (IOException ex) {
} catch (IOException ignore) {
} finally {
if (is != null)
try { is.close(); } catch (IOException ex) {}
try { is.close(); } catch (IOException ignore) {}
}
for (Map.Entry<Object,Object> ent : iniOptions.entrySet()) {
if (ent.getKey() instanceof String && ent.getValue() instanceof String) {
@ -99,8 +99,8 @@ public abstract class UCIEngineBase implements UCIEngine {
public final boolean setUCIOptions(Map<String,String> uciOptions) {
boolean modified = false;
for (Map.Entry<String,String> ent : uciOptions.entrySet()) {
String key = ((String)ent.getKey()).toLowerCase(Locale.US);
String value = (String)ent.getValue();
String key = ent.getKey().toLowerCase(Locale.US);
String value = ent.getValue();
if (configurableOption(key))
modified |= setOption(key, value);
}
@ -120,10 +120,10 @@ public abstract class UCIEngineBase implements UCIEngine {
try {
os = new FileOutputStream(optionsFile);
iniOptions.store(os, null);
} catch (IOException ex) {
} catch (IOException ignore) {
} finally {
if (os != null)
try { os.close(); } catch (IOException ex) {}
try { os.close(); } catch (IOException ignore) {}
}
}

8
DroidFishApp/src/main/java/org/petero/droidfish/engine/cuckoochess/CuckooChessEngine.java
View File

@ -49,7 +49,7 @@ public class CuckooChessEngine extends UCIEngineBase {
private LocalPipe engineToGui;
private Thread engineThread;
public CuckooChessEngine(Report report) {
public CuckooChessEngine() {
pos = null;
moves = new ArrayList<>();
quit = false;
@ -263,9 +263,9 @@ public class CuckooChessEngine extends UCIEngineBase {
}
quit = true;
}
} catch (ChessParseError ex) {
} catch (ArrayIndexOutOfBoundsException e) {
} catch (NumberFormatException nfe) {
} catch (ChessParseError ignore) {
} catch (ArrayIndexOutOfBoundsException ignore) {
} catch (NumberFormatException ignore) {
}
}

50
DroidFishApp/src/main/java/org/petero/droidfish/engine/cuckoochess/DroidEngineControl.java
View File

@ -42,31 +42,31 @@ import org.petero.droidfish.engine.LocalPipe;
public class DroidEngineControl {
LocalPipe os;
Thread engineThread;
private Thread engineThread;
private final Object threadMutex;
Search sc;
TranspositionTable tt;
History ht;
MoveGen moveGen;
private Search sc;
private TranspositionTable tt;
private History ht;
private MoveGen moveGen;
Position pos;
long[] posHashList;
int posHashListSize;
boolean ponder; // True if currently doing pondering
boolean onePossibleMove;
boolean infinite;
private Position pos;
private long[] posHashList;
private int posHashListSize;
private boolean ponder; // True if currently doing pondering
private boolean onePossibleMove;
private boolean infinite;
int minTimeLimit;
int maxTimeLimit;
int maxDepth;
int maxNodes;
List<Move> searchMoves;
private int minTimeLimit;
private int maxTimeLimit;
private int maxDepth;
private int maxNodes;
private List<Move> searchMoves;
// Options
int hashSizeMB = 2;
boolean ownBook = false;
boolean analyseMode = false;
boolean ponderMode = true;
private int hashSizeMB = 2;
private boolean ownBook = false;
private boolean analyseMode = false;
private boolean ponderMode = true;
// Reduced strength variables
private int strength = 1000;
@ -208,7 +208,7 @@ public class DroidEngineControl {
}
}
static int clamp(int val, int min, int max) {
private static int clamp(int val, int min, int max) {
if (val < min) {
return min;
} else if (val > max) {
@ -302,7 +302,7 @@ public class DroidEngineControl {
tt = new TranspositionTable(logSize);
}
final void setupPosition(Position pos, List<Move> moves) {
private void setupPosition(Position pos, List<Move> moves) {
UndoInfo ui = new UndoInfo();
posHashList = new long[200 + moves.size()];
posHashListSize = 0;
@ -316,7 +316,7 @@ public class DroidEngineControl {
/**
* Try to find a move to ponder from the transposition table.
*/
final Move getPonderMove(Position pos, Move m) {
private Move getPonderMove(Position pos, Move m) {
if (m == null)
return null;
Move ret = null;
@ -336,7 +336,7 @@ public class DroidEngineControl {
return ret;
}
static String moveToString(Move m) {
private static String moveToString(Move m) {
if (m == null)
return "0000";
String ret = TextIO.squareToString(m.from);
@ -388,7 +388,7 @@ public class DroidEngineControl {
} else if (optionName.equals("strength")) {
strength = Integer.parseInt(optionValue);
}
} catch (NumberFormatException nfe) {
} catch (NumberFormatException ignore) {
}
}
}

15
DroidFishApp/src/main/java/org/petero/droidfish/gamelogic/DroidChessController.java
View File

@ -218,13 +218,13 @@ public class DroidChessController {
dis = new DataInputStream(bais);
game.readFromStream(dis, version);
game.tree.translateMoves();
} catch (IOException e) {
} catch (ChessParseError e) {
} catch (IOException ignore) {
} catch (ChessParseError ignore) {
} finally {
if (dis != null)
try { dis.close(); } catch (IOException ex) {}
try { dis.close(); } catch (IOException ignore) {}
if (bais != null)
try { bais.close(); } catch (IOException ex) {}
try { bais.close(); } catch (IOException ignore) {}
}
}
@ -242,9 +242,9 @@ public class DroidChessController {
return null;
} finally {
if (dos != null)
try { dos.close(); } catch (IOException ex) {}
try { dos.close(); } catch (IOException ignore) {}
if (baos != null)
try { baos.close(); } catch (IOException ex) {}
try { baos.close(); } catch (IOException ignore) {}
}
}
@ -775,8 +775,7 @@ public class DroidChessController {
if (ponderMove != null) {
ArrayList<Move> tmp = new ArrayList<>();
tmp.add(ponderMove);
for (Move m : pvInfoV.get(i).pv)
tmp.add(m);
tmp.addAll(pvInfoV.get(i).pv);
pvMoves.add(tmp);
} else {
pvMoves.add(pvInfoV.get(i).pv);

4
DroidFishApp/src/main/java/org/petero/droidfish/gamelogic/Game.java
View File

@ -255,7 +255,7 @@ public class Game {
try {
if (TextIO.readFEN(TextIO.startPosFEN).equals(currPos))
stopTimer = true;
} catch (ChessParseError e) {
} catch (ChessParseError ignore) {
}
}
if (stopTimer) {
@ -382,7 +382,7 @@ public class Game {
updateTimeControl(true);
}
public static enum GameState {
public enum GameState {
ALIVE,
WHITE_MATE, // White mates
BLACK_MATE, // Black mates

23
DroidFishApp/src/main/java/org/petero/droidfish/gamelogic/GameTree.java
View File

@ -37,7 +37,8 @@ import org.petero.droidfish.gamelogic.TimeControlData.TimeControlField;
public class GameTree {
// Data from the seven tag roster (STR) part of the PGN standard
String event, site, date, round, white, black;
private String event, site, date, round;
public String white, black;
// Result is the last tag pair in the STR, but it is computed on demand from the game tree.
public Position startPos;
@ -63,7 +64,7 @@ public class GameTree {
this.gameStateListener = gameStateListener;
try {
setStartPos(TextIO.readFEN(TextIO.startPosFEN));
} catch (ChessParseError e) {
} catch (ChessParseError ignore) {
}
}
@ -114,11 +115,9 @@ public class GameTree {
ret.append(header);
ret.append('\n');
String[] words = sb.toString().split(" ");
int currLineLength = 0;
final int arrLen = words.length;
for (int i = 0; i < arrLen; i++) {
String word = words[i].trim();
for (String s : sb.toString().split(" ")) {
String word = s.trim();
int wordLen = word.length();
if (wordLen > 0) {
if (currLineLength == 0) {
@ -1390,7 +1389,7 @@ public class GameTree {
break;
nodeToAdd.playerAction = cmdPars;
}
} catch (IndexOutOfBoundsException e) {
} catch (IndexOutOfBoundsException ignore) {
}
if (options.imp.comments) {
if (moveAdded)
@ -1605,10 +1604,9 @@ public class GameTree {
private ArrayList<TimeControlField> stringToTCFields(String tcStr) {
String[] fields = tcStr.split(":");
int nf = fields.length;
ArrayList<TimeControlField> ret = new ArrayList<>(nf);
for (int i = 0; i < nf; i++) {
String f = fields[i].trim();
ArrayList<TimeControlField> ret = new ArrayList<>(fields.length);
for (String s : fields) {
String f = s.trim();
if (f.equals("?") || f.equals("-") || f.contains("*")) {
// Not supported
} else {
@ -1625,8 +1623,7 @@ public class GameTree {
if (idx >= 0) {
if (idx > 0)
time = (int)(Double.parseDouble(f.substring(0, idx).trim())*1e3);
if (idx >= 0)
f = f.substring(idx+1);
f = f.substring(idx+1);
inc = (int)(Double.parseDouble(f.trim())*1e3);
} else {
time = (int)(Double.parseDouble(f.trim())*1e3);

2
DroidFishApp/src/main/java/org/petero/droidfish/gamelogic/MoveGen.java
View File

@ -166,7 +166,7 @@ public class MoveGen {
/**
* Return true if a square is attacked by the opposite side.
*/
public static boolean sqAttacked(Position pos, int sq) {
private static boolean sqAttacked(Position pos, int sq) {
int x = Position.getX(sq);
int y = Position.getY(sq);
boolean isWhiteMove = pos.whiteMove;

2
DroidFishApp/src/main/java/org/petero/droidfish/tb/GtbProbe.java
View File

@ -42,7 +42,7 @@ class GtbProbe {
public void run() {
// Sleep 0.5s to increase probability that engine
// is initialized before TB.
try { Thread.sleep(500); } catch (InterruptedException e) { }
try { Thread.sleep(500); } catch (InterruptedException ignore) { }
initIfNeeded();
}
});

3
DroidFishApp/src/main/java/org/petero/droidfish/tb/Probe.java
View File

@ -310,8 +310,7 @@ public class Probe {
}
}
}
for (Move m : unknownMoves)
optimalMoves.add(m);
optimalMoves.addAll(unknownMoves);
return (optimalMoves.size() < moveList.size()) ? optimalMoves : null;
}

2
DroidFishApp/src/main/java/org/petero/droidfish/tb/ProbeResult.java
View File

@ -20,7 +20,7 @@ package org.petero.droidfish.tb;
/** Tablebase probe result. */
public final class ProbeResult implements Comparable<ProbeResult> {
public static enum Type {
public enum Type {
DTM, // score is distance (full moves) to mate, or 0
DTZ, // score is distance (full moves) to zeroing move, or 0
WDL, // score is +-1 or 0

3
DroidFishApp/src/main/java/org/petero/droidfish/tb/RtbProbe.java
View File

@ -42,7 +42,7 @@ public class RtbProbe {
public void run() {
// Sleep 0.4s to increase probability that engine
// is initialized before TB.
try { Thread.sleep(400); } catch (InterruptedException e) { }
try { Thread.sleep(400); } catch (InterruptedException ignore) { }
initIfNeeded();
}
});
@ -82,7 +82,6 @@ public class RtbProbe {
* x>0: Win in x plies
* x<0: Loss in -x plies
* NOINFO: No info available
* @return True if success.
*/
public final native void probe(byte[] squares,
boolean wtm,

4
DroidFishApp/src/main/java/org/petero/droidfish/view/ChessBoard.java
View File

@ -652,7 +652,7 @@ public abstract class ChessBoard extends View {
}
public final void setMoveHints(List<Move> moveHints) {
boolean equal = false;
boolean equal;
if ((this.moveHints == null) || (moveHints == null)) {
equal = this.moveHints == moveHints;
} else {
@ -665,7 +665,7 @@ public abstract class ChessBoard extends View {
}
public final void setSquareDecorations(ArrayList<SquareDecoration> decorations) {
boolean equal = false;
boolean equal;
if ((this.decorations == null) || (decorations == null)) {
equal = this.decorations == decorations;
} else {