From 86b7927f3704932e17b480377597daf8a606d228 Mon Sep 17 00:00:00 2001
From: Petr Baudis <pasky@ucw.cz>
Date: Sun, 8 Jan 2012 12:48:01 +0100
Subject: [PATCH] GTP: Rename Pachi extension commands to use the pachi- prefix

This concerns uct_evaluate, uct_gentbook and uct_dumptbook.
---
 distributed/distributed.c |  4 ++--
 gtp.c                     | 13 +++++++++----
 tools/autobook/expand.sh  |  2 +-
 tools/gentbook.sh         |  2 +-
 tools/sgf-ratemove.sh     |  2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/distributed/distributed.c b/distributed/distributed.c
index bcb528a..081f05a 100644
--- a/distributed/distributed.c
+++ b/distributed/distributed.c
@@ -160,8 +160,8 @@ distributed_notify(struct engine *e, struct board *b, int id, char *cmd, char *a
 	 * time_left will be part of next pachi-genmoves,
 	 * we reduce latency by not forwarding it here. */
 	if ((!strcasecmp(cmd, "quit") && !dist->slaves_quit)
-	    || !strcasecmp(cmd, "uct_gentbook")
-	    || !strcasecmp(cmd, "uct_dumptbook")
+	    || !strcasecmp(cmd, "pachi-gentbook")
+	    || !strcasecmp(cmd, "pachi-dumptbook")
 	    || !strcasecmp(cmd, "kgs-chat")
 	    || !strcasecmp(cmd, "time_left")
 
diff --git a/gtp.c b/gtp.c
index f4ddac0..0513a27 100644
--- a/gtp.c
+++ b/gtp.c
@@ -89,13 +89,18 @@ static char *known_commands =
 	"play\n"
 	"genmove\n"
 	"kgs-genmove_cleanup\n"
+	"pachi-genmoves\n"
+	"pachi-genmoves_cleanup\n"
 	"set_free_handicap\n"
 	"place_free_handicap\n"
 	"fixed_handicap\n"
 	"final_score\n"
 	"final_status_list\n"
 	"undo\n"
+	"pachi-evaluate\n"
 	"pachi-result\n"
+	"pachi-gentbook\n"
+	"pachi-dumptbook\n"
 	"kgs-chat\n"
 	"time_left\n"
 	"time_settings\n"
@@ -478,8 +483,8 @@ next_group:;
 			board_print(board, stderr);
 		gtp_reply(id, reply, NULL);
 
-	/* Custom commands for handling UCT opening tbook */
-	} else if (!strcasecmp(cmd, "uct_gentbook")) {
+	/* Custom commands for handling the tree opening tbook */
+	} else if (!strcasecmp(cmd, "pachi-gentbook")) {
 		/* Board must be initialized properly, as if for genmove;
 		 * makes sense only as 'uct_gentbook b'. */
 		char *arg;
@@ -490,14 +495,14 @@ next_group:;
 		else
 			gtp_error(id, "error generating tbook", NULL);
 
-	} else if (!strcasecmp(cmd, "uct_dumptbook")) {
+	} else if (!strcasecmp(cmd, "pachi-dumptbook")) {
 		char *arg;
 		next_tok(arg);
 		enum stone color = str2stone(arg);
 		uct_dumptbook(engine, board, color);
 		gtp_reply(id, NULL);
 
-	} else if (!strcasecmp(cmd, "uct_evaluate")) {
+	} else if (!strcasecmp(cmd, "pachi-evaluate")) {
 		char *arg;
 		next_tok(arg);
 		enum stone color = str2stone(arg);
diff --git a/tools/autobook/expand.sh b/tools/autobook/expand.sh
index 57ca0cc..5294689 100755
--- a/tools/autobook/expand.sh
+++ b/tools/autobook/expand.sh
@@ -13,7 +13,7 @@ priorsims=24
 pachi="$1"
 
 cat "$SEQDIR/a.sgf" | "$CMDDIR/../sgf2gtp.pl" -g |
-	sed -e 's/genmove/uct_evaluate/' |
+	sed -e 's/genmove/pachi-evaluate/' |
 	$pachi |
 	sed -ne '/^=/,${s/^= //;/./p}' |
 	while read move val; do
diff --git a/tools/gentbook.sh b/tools/gentbook.sh
index 1df4366..01844c5 100755
--- a/tools/gentbook.sh
+++ b/tools/gentbook.sh
@@ -18,7 +18,7 @@ gentbook1()
 {
 	echo "[#$n:$1]"
 	n=$((n+1))
-	echo -e 'boardsize '$size'\nclear_board\nkomi 7.5\nuct_gentbook b' |
+	echo -e 'boardsize '$size'\nclear_board\nkomi 7.5\npachi-gentbook b' |
 		./pachi -t =$games "policy=ucb1amaf:explore_p=$1$popts$opts"
 }
 gentbook1 0.0
diff --git a/tools/sgf-ratemove.sh b/tools/sgf-ratemove.sh
index 390139a..1b4eaf2 100755
--- a/tools/sgf-ratemove.sh
+++ b/tools/sgf-ratemove.sh
@@ -25,7 +25,7 @@
 sgf=$1; shift
 movenum=$1; shift
 tools/sgf2gtp.pl -g -n $movenum <"$sgf" |
-	sed -e 's/genmove/0 uct_evaluate/' |
+	sed -e 's/genmove/0 pachi-evaluate/' |
 	./pachi "$@" |
 	sed -ne '/^=0/,${s/^=0 //;p}' |
 	sort -n -t ' ' -k 2
-- 
2.11.4.GIT