Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sonar cube bugfixes #36

Merged
merged 2 commits into from
Feb 7, 2025
Merged

Sonar cube bugfixes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54f88e0
Fix Bugs listed by Sonar Qube.
Feb 6, 2025
2ac8911
Fix Bugs listed by Sonar Qube.
Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions cuckoo-engine/src/main/java/org/petero/cuckoo/engine/chess/Book.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,18 +178,19 @@ public final String getAllBookMoves(Position pos) {
}

/** Creates the book.bin file. */
public static void main(String[] args) throws IOException {
public static void main(String[] args) {
List<Byte> binBook = createBinBook();
FileOutputStream out = new FileOutputStream("../src/book.bin");
int bookLen = binBook.size();
byte[] binBookA = new byte[bookLen];
for (int i = 0; i < bookLen; i++)
binBookA[i] = binBook.get(i);
out.write(binBookA);
out.close();
try (FileOutputStream out = new FileOutputStream("../src/book.bin")) {
int bookLen = binBook.size();
byte[] binBookA = new byte[bookLen];
for (int i = 0; i < bookLen; i++) binBookA[i] = binBook.get(i);
out.write(binBookA);
} catch (IOException e) {
e.printStackTrace();
}

public static List<Byte> createBinBook() {
}

public static List<Byte> createBinBook() {
List<Byte> binBook = new ArrayList<>(0);
try {
InputStream inStream = Object.class.getResourceAsStream("/book.txt");
Expand Down
2 changes: 1 addition & 1 deletion cuckoo-engine/src/main/java/org/petero/cuckoo/engine/chess/ComputerPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ private Move findSemiRandomMove(Search sc, MoveGen.MoveList moves) {
for (int mi = 0; mi < moves.size; mi++) {
sum += moveProbWeight(moves.m[mi].score, bestScore);
}
int rnd = rndGen.nextInt(sum);
int rnd = sum == 0 ? 0 : rndGen.nextInt(sum);
for (int mi = 0; mi < moves.size; mi++) {
int weight = moveProbWeight(moves.m[mi].score, bestScore);
if (rnd < weight) {
Expand Down
4 changes: 2 additions & 2 deletions cuckoo-engine/src/main/java/org/petero/cuckoo/engine/chess/Evaluate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ private static int kpkEval(int wKing, int bKing, int wPawn, boolean whiteMove) {

int bytePos = index / 8;
int bitPos = index % 8;
boolean draw = ((kpkTable[bytePos]) & (1 << bitPos)) == 0;
boolean draw = ((kpkTable[bytePos] & 0xff) & (1 << bitPos)) == 0;
if (draw)
return 0;
return qV - pV / 4 * (7-Position.getY(wPawn));
Expand All @@ -1148,7 +1148,7 @@ private static int krkpEval(int wKing, int bKing, int bPawn, boolean whiteMove)
index = index * 48 + bPawn - 8;
index = index * 8 + Position.getY(wKing);
byte mask = krkpTable[index];
boolean canWin = (mask & (1 << Position.getX(wKing))) != 0;
boolean canWin = (mask & 0xff & (1 << Position.getX(wKing))) != 0;

int score = rV - pV + Position.getY(bPawn) * pV / 4;
if (canWin)
Expand Down
6 changes: 5 additions & 1 deletion cuckoo-engine/src/main/java/org/petero/cuckoo/engine/chess/TreeLogger.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import java.nio.channels.FileChannel.MapMode;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Objects;

import org.petero.cuckoo.engine.chess.TranspositionTable.TTEntry;

public final class TreeLogger {
Expand Down Expand Up @@ -161,7 +163,7 @@ private static int indexToFileOffs(int index) {

/** Compute endIndex for all StartNode entries. */
private void computeForwardPointers() {
if ((mapBuf.get(127) & (1<<7)) != 0)
if ((mapBuf.get(127) & 0xff & (1<<7)) != 0)
return;
System.out.print("Computing forward pointers...\n");
StartEntry se = new StartEntry();
Expand Down Expand Up @@ -213,6 +215,7 @@ private boolean readEntry(int index, StartEntry se, EndEntry ee) {
int otherIndex = bb.getInt(0);
boolean isStartEntry = (otherIndex == -1) || (otherIndex > index);
if (isStartEntry) {
Objects.requireNonNull(se);
se.endIndex = otherIndex;
se.parentIndex = bb.getInt(4);
int m = bb.getShort(8);
Expand All @@ -222,6 +225,7 @@ private boolean readEntry(int index, StartEntry se, EndEntry ee) {
se.ply = bb.get(14);
se.depth = bb.get(15);
} else {
Objects.requireNonNull(ee);
ee.startIndex = otherIndex;
ee.score = bb.getShort(4);
ee.scoreType = bb.getShort(6);
Expand Down
63 changes: 31 additions & 32 deletions cuckoo-engine/src/main/java/org/petero/cuckoo/engine/guibase/ChessController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,62 +183,60 @@ public void setPGN(String pgn) throws ChessParseError {

// Parse tag section
Position pos = TextIO.readFEN(TextIO.START_POS_FEN);
Scanner sc = new Scanner(pgn);
sc.useDelimiter("\\s+");
while (sc.hasNext("\\[.*")) {
try (Scanner sc = new Scanner(pgn)) {
sc.useDelimiter("\\s+");
while (sc.hasNext("\\[.*")) {
String tagName = sc.next();
if (tagName.length() > 1) {
tagName = tagName.substring(1);
tagName = tagName.substring(1);
} else {
tagName = sc.next();
tagName = sc.next();
}
String tagValue = sc.findWithinHorizon(".*\\]", 0);
tagValue = tagValue.trim();
if (tagValue.charAt(0) == '"')
tagValue = tagValue.substring(1);
if (tagValue.charAt(tagValue.length()-1) == ']')
tagValue = tagValue.substring(0, tagValue.length() - 1);
if (tagValue.charAt(tagValue.length()-1) == '"')
tagValue = tagValue.substring(0, tagValue.length() - 1);
if (tagValue.charAt(0) == '"') tagValue = tagValue.substring(1);
if (tagValue.charAt(tagValue.length() - 1) == ']')
tagValue = tagValue.substring(0, tagValue.length() - 1);
if (tagValue.charAt(tagValue.length() - 1) == '"')
tagValue = tagValue.substring(0, tagValue.length() - 1);
if (tagName.equals("FEN")) {
pos = TextIO.readFEN(tagValue);
pos = TextIO.readFEN(tagValue);
}
}
game.processString("new");
game.pos = pos;
}
game.processString("new");
game.pos = pos;

// Handle (ignore) recursive annotation variations
{
// Handle (ignore) recursive annotation variations
{
StringBuilder out = new StringBuilder();
sc.useDelimiter("");
int level = 0;
while (sc.hasNext()) {
String c = sc.next();
if (c.equals("(")) {
level++;
} else if (c.equals(")")) {
level--;
} else if (level == 0) {
out.append(c);
}
String c = sc.next();
if (c.equals("(")) {
level++;
} else if (c.equals(")")) {
level--;
} else if (level == 0) {
out.append(c);
}
}
pgn = out.toString();
}
}
sc.close();

// Parse move text section
sc = new Scanner(pgn);
sc.useDelimiter("\\s+");
while (sc.hasNext()) {
try (Scanner sc = new Scanner(pgn)) {
sc.useDelimiter("\\s+");
while (sc.hasNext()) {
String strMove = sc.next();
strMove = strMove.replaceFirst("\\$?[0-9]*\\.*([^?!]*)[?!]*", "$1");
if (strMove.isEmpty()) continue;
Optional<Move> m = TextIO.stringToMove(game.pos, strMove);
if (m.isEmpty())
break;
if (m.isEmpty()) break;
game.processString(strMove);
}
}
sc.close();
}

public final boolean humansTurn() {
Expand Down Expand Up @@ -404,6 +402,7 @@ public synchronized void stopComputerThinking() {
computerThread.join();
} catch (InterruptedException ex) {
System.out.printf("Could not stop thread%n");
computerThread.interrupt();
}
computerThread = null;
updateGUI();
Expand Down
10 changes: 7 additions & 3 deletions cuckoo-gui/src/main/java/org/petero/cuckoo/gui/AppletGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

import java.awt.*;
import java.io.Serial;
import java.lang.reflect.InvocationTargetException;

/**
* The main class for the chess GUI.
Expand All @@ -42,7 +43,7 @@ public class AppletGUI extends JFrame implements GUIInterface {
String moveListStr = "";
String thinkingStr = "";

public AppletGUI(String title) throws HeadlessException {
public AppletGUI(String title) {
super(title);
ctrl = new ChessController(this);
try {
Expand All @@ -52,8 +53,11 @@ public AppletGUI(String title) throws HeadlessException {
ctrl.newGame(playerWhite.isSelected(), TT_LOG_SIZE, true);
ctrl.startGame();
});
} catch (Exception ex) {
ex.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
e.printStackTrace();
}
}

Expand Down
25 changes: 17 additions & 8 deletions cuckoo-uci/src/main/java/org/petero/cuckoo/uci/EngineControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
* @author petero
*/
public class EngineControl {

private static final Random random = new Random();

final PrintStream os;

Thread engineThread;
Expand Down Expand Up @@ -156,14 +159,17 @@ public final void ponderHit() {
}
infinite = (maxTimeLimit < 0) && (maxDepth < 0) && (maxNodes < 0);
ponder = false;
synchronized (threadMutex) {
threadMutex.notifyAll();
}
}

public final void stopSearch() {
stopThread();
}

public final void newGame() {
randomSeed = new Random().nextLong();
randomSeed = random.nextLong();
tt.clear();
}

Expand Down Expand Up @@ -200,7 +206,7 @@ public final void computeTimeLimit(SearchParams sPar) {
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 / 2.0))));

// Leave at least 1s on the clock, but can't use negative time
minTimeLimit = clamp(minTimeLimit, time - margin);
Expand Down Expand Up @@ -245,14 +251,17 @@ private void startThread(final int minTimeLimit, final int maxTimeLimit, int max
if (m == null) {
m = sc.iterativeDeepening(srchMoves, srchmaxDepth, maxNodes, false);
}
while (ponder || infinite) {

// We should not respond until told to do so. Just wait
// until
// we are allowed to respond.
try {
Thread.sleep(10);
} catch (InterruptedException ex) {
break;
synchronized (threadMutex) {
while (ponder || infinite) {
try {
threadMutex.wait();
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
}
}
Move ponderMove = getPonderMove(pos, m);
Expand Down Expand Up @@ -283,7 +292,7 @@ private void stopThread() {
try {
myThread.join();
} catch (InterruptedException ex) {
throw new RuntimeException();
myThread.interrupt();
}
}
}
Expand Down