From 07103358be1a2a550ad1f6663a3724fbc1652451 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Thu, 9 Jun 2011 10:18:39 +0200 Subject: [PATCH] version 1.4.64b --- ChangeLog | 2 ++ README | 8 +++++++- config.h | 6 +++--- configure | 20 ++++++++++---------- configure.ac | 2 +- main.c | 2 +- option.c | 4 +++- polyglot.man | 8 +++++++- polyglot.pod | 7 +++++++ polyglot.spec | 2 +- xboard2uci.c | 13 +++++++++++-- 11 files changed, 53 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index b19706e..288437b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +========1.4.64b================= +- Reduce movetime in the implementation of the fixed time per move command, to taccount for differences in the wording of the protocols. ========1.4.63b================= - Give ponder move as hint. - Support for egtpath gaviota (this is a bit hacky right now). diff --git a/README b/README index 8fbea2e..9370479 100644 --- a/README +++ b/README @@ -425,6 +425,12 @@ CONFIG FILE FORMAT This a bit vector in which each bit represents the processors that a process is allowed to run on. This option works only on Windows. + STFudge (default: 20) + PolyGlot will translate "st x" as "go movetime 1000*x-STFudge". + The rationale is that in the UCI specification the argument of + movetime is defined as the exact search time whereas the argument + of the st command is only an upperbound. + OnlyWbOptions (default: true) If true then PolyGlot restricts the options it sends to those that are potentially useful for WinBoard. @@ -550,4 +556,4 @@ SEE ALSO - 2010-04-25 POLYGLOT(6) + 2010-12-31 POLYGLOT(6) diff --git a/config.h b/config.h index 589c256..c6da565 100644 --- a/config.h +++ b/config.h @@ -115,7 +115,7 @@ #define PACKAGE_NAME "polyglot" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "polyglot 1.4.63b" +#define PACKAGE_STRING "polyglot 1.4.64b" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "polyglot" @@ -124,7 +124,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.4.63b" +#define PACKAGE_VERSION "1.4.64b" /* Define as the return type of signal handlers (`int' or `void'). */ #define RETSIGTYPE void @@ -145,7 +145,7 @@ #define TIME_WITH_SYS_TIME 1 /* Version number of package */ -#define VERSION "1.4.63b" +#define VERSION "1.4.64b" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ diff --git a/configure b/configure index e1d9e6e..e8a8681 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for polyglot 1.4.63b. +# Generated by GNU Autoconf 2.64 for polyglot 1.4.64b. # # Report bugs to . # @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='polyglot' PACKAGE_TARNAME='polyglot' -PACKAGE_VERSION='1.4.63b' -PACKAGE_STRING='polyglot 1.4.63b' +PACKAGE_VERSION='1.4.64b' +PACKAGE_STRING='polyglot 1.4.64b' PACKAGE_BUGREPORT='michel.vandenbergh@uhasselt.be' PACKAGE_URL='' @@ -1230,7 +1230,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures polyglot 1.4.63b to adapt to many kinds of systems. +\`configure' configures polyglot 1.4.64b to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1296,7 +1296,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of polyglot 1.4.63b:";; + short | recursive ) echo "Configuration of polyglot 1.4.64b:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -polyglot configure 1.4.63b +polyglot configure 1.4.64b generated by GNU Autoconf 2.64 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1808,7 +1808,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by polyglot $as_me 1.4.63b, which was +It was created by polyglot $as_me 1.4.64b, which was generated by GNU Autoconf 2.64. Invocation command line was $ $0 $@ @@ -2616,7 +2616,7 @@ fi # Define the identity of the package. PACKAGE='polyglot' - VERSION='1.4.63b' + VERSION='1.4.64b' cat >>confdefs.h <<_ACEOF @@ -5388,7 +5388,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by polyglot $as_me 1.4.63b, which was +This file was extended by polyglot $as_me 1.4.64b, which was generated by GNU Autoconf 2.64. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5452,7 +5452,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -polyglot config.status 1.4.63b +polyglot config.status 1.4.64b configured by $0, generated by GNU Autoconf 2.64, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index eb1b55e..5c775bf 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([polyglot], [1.4.63b], [michel.vandenbergh@uhasselt.be]) +AC_INIT([polyglot], [1.4.64b], [michel.vandenbergh@uhasselt.be]) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([mainloop.c]) AC_CONFIG_HEADER([config.h]) diff --git a/main.c b/main.c index f2847b9..32cee32 100644 --- a/main.c +++ b/main.c @@ -39,7 +39,7 @@ // constants -static const char * const Version = "1.4.63b"; +static const char * const Version = "1.4.64b"; static const char * const HelpMessage = "\ SYNTAX\n\ * polyglot [configfile] [-noini] [-ec engine] [-ed enginedirectory] [-en enginename] [-log true/false] [-lf logfile] [-pg =]* [-uci =]*\n\ diff --git a/option.c b/option.c index 8dfae10..57935ad 100644 --- a/option.c +++ b/option.c @@ -65,9 +65,11 @@ option_t DefaultOptions[] = { { "KibitzDelay", "spin","0","1000", "5" , NULL,0,NNB, PG|XBOARD}, { "KibitzInterval", "spin","0","1000", "0" , NULL,0,NNB, PG|XBOARD}, - { "ShowPonder", "check","0","0", "true" , NULL,0,NNB, PG|XBOARD}, + { "ShowPonder", "check","0","0", "true" , NULL,0,NNB, PG|XBOARD}, { "ScoreWhite", "check","0","0", "false" , NULL,0,NNB, PG|XBOARD}, + { "STFudge", "spin","0","1000", "20" , NULL,0,NNB, PG|XBOARD|XBSEL}, + // work-arounds { "UCIVersion", "spin","1","2", "2" , NULL,0,NNB, PG|XBOARD}, diff --git a/polyglot.man b/polyglot.man index d50dd54..32022f1 100644 --- a/polyglot.man +++ b/polyglot.man @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "POLYGLOT 6" -.TH POLYGLOT 6 "2010-04-25" "" "" +.TH POLYGLOT 6 "2010-12-31" "" "" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -556,6 +556,12 @@ Win32 priority levels are mapped in a sensible way to Unix nice levels. .IX Item "Affinity (default: -1)" This a bit vector in which each bit represents the processors that a process is allowed to run on. This option works only on Windows. +.IP "\fBSTFudge\fR (default: 20)" 4 +.IX Item "STFudge (default: 20)" +PolyGlot will translate \*(L"st x\*(R" as \*(L"go movetime 1000*x\-STFudge\*(R". +The rationale is that in the \s-1UCI\s0 specification the argument of movetime +is defined as the exact search time whereas the argument of the +st command is only an upperbound. .IP "\fBOnlyWbOptions\fR (default: true)" 4 .IX Item "OnlyWbOptions (default: true)" If true then PolyGlot restricts the options it sends to those that diff --git a/polyglot.pod b/polyglot.pod index c78fc6e..ee37df6 100644 --- a/polyglot.pod +++ b/polyglot.pod @@ -523,6 +523,13 @@ Win32 priority levels are mapped in a sensible way to Unix nice levels. This a bit vector in which each bit represents the processors that a process is allowed to run on. This option works only on Windows. +=item B (default: 20) + +PolyGlot will translate "st x" as "go movetime 1000*x-STFudge". +The rationale is that in the UCI specification the argument of movetime +is defined as the exact search time whereas the argument of the +st command is only an upperbound. + =item B (default: true) If true then PolyGlot restricts the options it sends to those that diff --git a/polyglot.spec b/polyglot.spec index 8643a3e..6189ba4 100644 --- a/polyglot.spec +++ b/polyglot.spec @@ -1,6 +1,6 @@ Summary: A Winboard protocol to UCI protocol adapter Name: polyglot -Version: 1.4.63b +Version: 1.4.64b Release: 1 License: GPL Group: Amusement/Games diff --git a/xboard2uci.c b/xboard2uci.c index fe0ded3..8f4614e 100644 --- a/xboard2uci.c +++ b/xboard2uci.c @@ -1334,9 +1334,17 @@ static void search_update() { " nodes %.0f", XB->time_max*((double)XB->node_rate)); }else{ + double computed_time; + double st_fudge; + st_fudge=(double) option_get_int(Option,"STFudge"); + my_log("POLYGLOT Giving engine %.0fmsec extra time.\n",st_fudge); + computed_time=XB->time_max*1000.0-st_fudge; + if(computed_time< 1.0){ + computed_time=1.0; + } engine_send_queue(Engine, " movetime %.0f", - XB->time_max*1000.0); + computed_time); } } else { @@ -1583,8 +1591,9 @@ static void send_info() { }else{ min_depth=1; } + gui_send(GUI,"%d %+d %.0f "S64_FORMAT" %s",Uci->best_depth>min_depth?Uci->best_depth:min_depth, - 0,0,0.0,0,Uci->info); + 0,0.0,0,Uci->info); } // send_pv() -- 1.7.0.4