This is the real v0.1.0 commit

Move to position search instead of searchmoves

Author: cout-hello-world

src/main/java/metaengine/GoResult.java

@@ -3,6 +3,7 @@
 public class GoResult {
     private final Score score;
     private final UCIMove move;
+    private static final int MATE_CUTOFF = 100;
     public GoResult(Score score, UCIMove move) {
         this.score = score;
         this.move = move;
@@ -41,6 +42,16 @@ public Score getBiasedScore(int bias) {
             }
         }
 
+        public Score flip() {
+            if (comparisonScore > Integer.MAX_VALUE - MATE_CUTOFF) {
+                return new Score(comparisonScore - Integer.MAX_VALUE, true);
+            } else if (comparisonScore < Integer.MIN_VALUE + MATE_CUTOFF) {
+                return new Score(comparisonScore - Integer.MIN_VALUE, true);
+            } else {
+                return new Score(-comparisonScore);
+            }
+        }
+
         @Override
         public boolean equals(Object other) {
             if (other == null || !(other instanceof Score)) {
@@ -62,18 +73,18 @@ public int compareTo(Score other) {
 
         @Override
         public String toString() {
-            if (comparisonScore > Integer.MAX_VALUE - 100) {
+            if (comparisonScore > Integer.MAX_VALUE - MATE_CUTOFF) {
                 return "mate " + (Integer.MAX_VALUE - comparisonScore);
-            } else if (comparisonScore < Integer.MIN_VALUE + 100) {
+            } else if (comparisonScore < Integer.MIN_VALUE + MATE_CUTOFF) {
                 return "mate " + (Integer.MIN_VALUE - comparisonScore);
             } else {
                 return "cp " + comparisonScore;
             }
         }
 
         public boolean isMateScore() {
-            return comparisonScore > Integer.MAX_VALUE - 100 ||
-                   comparisonScore < Integer.MIN_VALUE + 100;
+            return comparisonScore > Integer.MAX_VALUE - MATE_CUTOFF ||
+                   comparisonScore < Integer.MIN_VALUE + MATE_CUTOFF;
         }
     }
 }

src/main/java/metaengine/ProcessIO.java

@@ -8,27 +8,23 @@
 import java.io.IOException;
 
 public class ProcessIO {
+    private static final boolean DEBUG_WRITES = false;
+    private static final boolean DEBUG_READS = false;
     private final Object readMutex = new Object();
     private final BufferedReader fromProc;
     private final Object writeMutex = new Object();
     private final PrintWriter toProc;
-    private final boolean debug;
     private final String name;
 
-    public ProcessIO(Process proc, String name, boolean debug) {
+    public ProcessIO(Process proc, String name) {
         fromProc = new BufferedReader(new InputStreamReader(
                        proc.getInputStream()));
         toProc =
             new PrintWriter(new BufferedWriter(
               new OutputStreamWriter(proc.getOutputStream())), true);
-        this.debug = debug;
         this.name = name;
     }
 
-    public ProcessIO(Process proc, String name) {
-        this(proc, name, false);
-    }
-
     public ProcessIO(Process proc) {
         this(proc, null);
     }
@@ -42,7 +38,7 @@ public String readLine() {
         } catch (IOException e) {
             throw new RuntimeException("Unexpted error reading from process");
         }
-        if (debug) {
+        if (DEBUG_READS) {
             String toPrint = "DEBUG: Read \"" + result + "\"";
             if (name != null) {
                 toPrint += " from \"" + name + "\"";
@@ -56,8 +52,8 @@ public void sendLine(String line) {
         synchronized (writeMutex) {
             toProc.println(line);
         }
-        if (debug) {
-            String toPrint = "DEGUG: Sent \"" + line + "\"";
+        if (DEBUG_WRITES) {
+            String toPrint = "DEBUG: Sent \"" + line + "\"";
             if (name != null) {
                 toPrint += " to \"" + name + "\"";
             }

src/main/java/metaengine/UCIEngine.java

@@ -10,8 +10,6 @@
 
 
 public class UCIEngine {
-    private static final boolean DEBUG_IO = false;
-
     private final Process engineProcess;
     private final String engineName;
     private List<UCIOption> options = null;
@@ -30,7 +28,7 @@ public UCIEngine (List<String> argv)
         ProcessBuilder pb = new ProcessBuilder(argv);
         pb.redirectError(ProcessBuilder.Redirect.INHERIT);
         engineProcess = pb.start();
-        engineIO = new ProcessIO(engineProcess, engineName, DEBUG_IO);
+        engineIO = new ProcessIO(engineProcess, engineName);
         populateOptions();
     }
 
@@ -159,7 +157,7 @@ public void synchronize() {
     }
 
     public void position(UCIPosition pos) {
-        engineIO.sendLine("position " + pos.toString());
+        engineIO.sendLine(pos.toString());
     }
 
     public void quit() {

src/main/java/metaengine/UCIEnginesManager.java

@@ -20,6 +20,7 @@ public class UCIEnginesManager {
     private final List<EngineRecord> enginesList;
     private final List<EngineRecord> recomenderRecords = new ArrayList<>();
     private final List<EngineRecord> judgeRecords = new ArrayList<>();
+    private UCIPosition currentPosition = UCIPosition.STARTPOS;
 
     public static UCIEnginesManager create(Configuration conf)
       throws InvalidConfigurationException {
@@ -182,12 +183,13 @@ public UCIMove call() {
                 for (int i = 0; i != judgeRecords.size(); ++i) {
                     UCIEngine judge = judgeRecords.get(i).getEngine();
                     String[] goCtorParam = {
-                        "go", "searchmoves",
-                        recResults.get(i).getMove().toString(),
-                        "movetime",
+                        "go", "movetime",
                         Long.toString(timerTime / 1000000L)
                     };
+                    UCIPosition judgePosition =
+                        currentPosition.plus(recResults.get(i).getMove());
                     judgeFutures.add(Main.threadPool.submit(() -> {
+                        judge.position(judgePosition);
                         return judge.go(new UCIGo(goCtorParam));
                     }));
                 }
@@ -201,7 +203,8 @@ public UCIMove call() {
                 GoResult.Score bestScore =
                     new GoResult.Score(Integer.MIN_VALUE);
                 for (int i = 0; i != judgeResults.size(); ++i) {
-                    GoResult.Score origScore = judgeResults.get(i).getScore();
+                    GoResult.Score origScore =
+                        judgeResults.get(i).getScore().flip();
                     GoResult.Score score = origScore.getBiasedScore(
                         recomenderRecords.get(i).getConfig().getBias());
                     if (score.compareTo(bestScore) >= 0) {
@@ -223,11 +226,11 @@ public void setPosition(UCIPosition pos) {
             UCIEngine engine = rec.getEngine();
             engine.position(pos);
         }
+        currentPosition = pos;
     }
 
 
     public Future<UCIMove> search(UCIGo params) {
-        SearchInfo result = new SearchInfo();
         return Main.threadPool.submit(new Searcher(params));
     }
 

src/main/java/metaengine/UCIPosition.java

@@ -3,6 +3,9 @@
 public class UCIPosition {
     // Right now this class is implemented the lazy way. We just store
     // the string as-is. This may change if further functionality is needed.
+    public static final UCIPosition STARTPOS = new UCIPosition(new String[] {
+        "position", "startpos"
+    });
     private final String pos;
 
     UCIPosition(String[] tokens) {
@@ -11,12 +14,42 @@ public class UCIPosition {
         for (String token : tokens) {
             if (afterFirstToken) {
                 temp += " " + token;
+            } else {
+                temp = token;
             }
             afterFirstToken = true;
         }
         pos = temp;
     }
 
+    UCIPosition plus(UCIMove move) {
+        String[] tokens = UCIUtils.tokenize(pos);
+        boolean hasMoves = false;
+        for (String str : tokens) {
+            if (str.equals("moves")) {
+                hasMoves = true;
+                break;
+            }
+        }
+
+        if (hasMoves) {
+            String[] ctorParam = new String[tokens.length + 1];
+            for (int i = 0; i != tokens.length; ++i) {
+                ctorParam[i] = tokens[i];
+            }
+            ctorParam[tokens.length] = move.toString();
+            return new UCIPosition(ctorParam);
+        } else {
+            String[] ctorParam = new String[tokens.length + 2];
+            for (int i = 0; i != tokens.length; ++i) {
+                ctorParam[i] = tokens[i];
+            }
+            ctorParam[tokens.length] = "moves";
+            ctorParam[tokens.length + 1] = move.toString();
+            return new UCIPosition(ctorParam);
+        }
+    }
+
     @Override
     public String toString() {
         return pos;