X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard2uci.c;h=c8c835474779d1994de309664dba9f3ba8862aae;hb=60900035e6d0309705f2326ee50edc52386305e9;hp=6dda5cf491bad8fe9875eadf65ae7d057a40aa98;hpb=5eed4adb3552562329c0b0b460c8851efb1a38bb;p=polyglot.git

diff --git a/xboard2uci.c b/xboard2uci.c
index 6dda5cf..c8c8354 100644
--- a/xboard2uci.c
+++ b/xboard2uci.c
@@ -27,6 +27,7 @@
 #include "uci.h"
 #include "uci2uci.h"
 #include "util.h"
+#include "xboard2uci.h"
 
 // defines
 
@@ -74,6 +75,8 @@ typedef struct {
     
     double my_time;
     double opp_time;
+
+    int node_rate;
 } xb_t;
 
 typedef enum { WAIT, THINK, PONDER, ANALYSE } dummy_state_t;
@@ -164,6 +167,8 @@ void xboard2uci_init() {
 
    XB->my_time = 300.0;
    XB->opp_time = 300.0;
+
+   XB->node_rate = -1;
 }
 
 // xboard2uci_gui_step()
@@ -319,6 +324,7 @@ void xboard2uci_gui_step(char string[]) {
 			XB->result = FALSE;
 
 			XB->depth_limit = FALSE;
+            XB->node_rate=-1;
 
 			XB->computer = FALSE;
 			my_string_set(&XB->name,"<empty>");
@@ -355,7 +361,10 @@ void xboard2uci_gui_step(char string[]) {
 				ASSERT(XB->ping==-1);
 				gui_send(GUI,"pong %s",Star[0]);
 			}
-
+        } else if (match(string,"nps *")) {
+            
+                // fake WB play-by-nodes mode
+            XB->node_rate = atoi(Star[0]);
 		} else if (match(string,"playother")) {
 
 			State->computer[game_turn(Game)] = FALSE;
@@ -468,12 +477,17 @@ void xboard2uci_gui_step(char string[]) {
             }
         } else if (match(string,"option *")){
             char *name=Star[0];
-            start_protected_command();
+             if(match(name, "Polyglot *")){
+                char *pg_name=Star[0];
+                polyglot_set_option(pg_name,"<empty>");
+	     }else{           
+	       start_protected_command();
                 // value is ignored
-            if(!uci_send_option(Uci, name, "%s", "<empty>")){
-               gui_send(GUI,"Error (unknown option): %s",name); 
-            }; 
-            end_protected_command();
+	       if(!uci_send_option(Uci, name, "%s", "<empty>")){
+		 gui_send(GUI,"Error (unknown option): %s",name); 
+	       }; 
+	       end_protected_command();
+	     }
         } else if (XB->has_feature_smp && match(string,"cores *")){
                 int cores=atoi(Star[0]);
                 if(cores>=1){
@@ -768,25 +782,27 @@ void format_xboard_option_line(char * option_line, option_t *opt){
     strcat(option_line,option_string);
     sprintf(option_string," -%s",opt->type);
     strcat(option_line,option_string);
-    if(strcmp(opt->type,"button") && strcmp(opt->type,"combo")){
+    if(!IS_BUTTON(opt->type) && strcmp(opt->type,"combo")){
         if(strcmp(opt->type,"check")){
-            sprintf(option_string," %s",opt->default_);
+            sprintf(option_string," %s",opt->value);
         }else{
             sprintf(option_string," %d",
-                    my_string_case_equal(opt->default_,"true")?1:0);
+                    my_string_case_equal(opt->value,"true")||
+                    my_string_equal(opt->value,"1")
+                    ?1:0);
         }
         strcat(option_line,option_string);
     }
-    if(!strcmp(opt->type,"spin")){
+    if(IS_SPIN(opt->type)){
         sprintf(option_string," %s",opt->min);
             strcat(option_line,option_string);
     }
-    if(!strcmp(opt->type,"spin")){
+    if(IS_SPIN(opt->type)){
         sprintf(option_string," %s",opt->max);
         strcat(option_line,option_string);
     }
     for(j=0;j<opt->var_nb;j++){
-        if(!strcmp(opt->var[j],opt->default_)){
+        if(!strcmp(opt->var[j],opt->value)){
             sprintf(option_string," *%s",opt->var[j]);
         }else{
             sprintf(option_string," %s",opt->var[j]);
@@ -809,10 +825,7 @@ void format_xboard_option_line(char * option_line, option_t *opt){
 
 static void send_xboard_options(){
 
-    char option_line[StringSize]="";
-    const char * name;
-    option_t *opt;
-    
+   
     gui_send(GUI,"feature done=0");
     
     gui_send(GUI,"feature analyze=1");
@@ -832,6 +845,7 @@ static void send_xboard_options(){
     gui_send(GUI,"feature sigterm=0");
     gui_send(GUI,"feature time=1");
     gui_send(GUI,"feature usermove=1");
+    gui_send(GUI,"feature nps=1");
     if (XB->has_feature_memory){
         gui_send(GUI,"feature memory=1");
     }else{
@@ -855,37 +869,44 @@ static void send_xboard_options(){
         gui_send(GUI,"feature variants=\"normal\"");
     }
 
-    option_start_iter(Uci->option);
-    while((opt=option_next(Uci->option))){
-        if(my_string_case_equal(opt->name,"UCI_AnalyseMode")) continue;
-        if(my_string_case_equal(opt->name,"UCI_Opponent")) continue;
-        if(my_string_case_equal(opt->name,"UCI_Chess960")) continue;
-        if(my_string_case_equal(opt->name,"UCI_ShowCurrLine")) continue;
-        if(my_string_case_equal(opt->name,"UCI_ShowRefutations")) continue;
-        if(my_string_case_equal(opt->name,"UCI_ShredderbasesPath")) continue;
-        if(my_string_case_equal(opt->name,"UCI_SetPositionValue")) continue;
-        if(my_string_case_equal(opt->name,"UCI_DrawOffers")) continue;
-        if(my_string_case_equal(opt->name,"Ponder")) continue;
-        if(my_string_case_equal(opt->name,"Hash")) continue;
-        if(my_string_case_equal(opt->name,"NalimovPath")) continue;
-        if((name=uci_thread_option(Uci))!=NULL &&
-           my_string_case_equal(opt->name,name)) continue;
-        
-        format_xboard_option_line(option_line,opt);
-        
-        gui_send(GUI,"%s",option_line);
-    }
-
+    xboard2uci_send_options();
+}
 
-    option_start_iter(Option);
-    while((opt=option_next(Option))){
-        if(opt->mode &XBOARD){
-            format_xboard_option_line(option_line,opt);
-            gui_send(GUI,"%s",option_line);
-        }
-    }       
-    gui_send(GUI,"feature done=1"); 
+void xboard2uci_send_options(){
+  char option_line[StringSize]="";
+  const char * name;
+  option_t *opt;
+  
+  option_start_iter(Uci->option);
+  while((opt=option_next(Uci->option))){
+    if(my_string_case_equal(opt->name,"UCI_AnalyseMode")) continue;
+    if(my_string_case_equal(opt->name,"UCI_Opponent")) continue;
+    if(my_string_case_equal(opt->name,"UCI_Chess960")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShowCurrLine")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShowRefutations")) continue;
+    if(my_string_case_equal(opt->name,"UCI_ShredderbasesPath")) continue;
+    if(my_string_case_equal(opt->name,"UCI_SetPositionValue")) continue;
+    if(my_string_case_equal(opt->name,"UCI_DrawOffers")) continue;
+    if(my_string_case_equal(opt->name,"Ponder")) continue;
+    if(my_string_case_equal(opt->name,"Hash")) continue;
+    if(my_string_case_equal(opt->name,"NalimovPath")) continue;
+    if((name=uci_thread_option(Uci))!=NULL &&
+       my_string_case_equal(opt->name,name)) continue;
+    format_xboard_option_line(option_line,opt);
     
+    gui_send(GUI,"%s",option_line);
+  }
+  
+  
+  option_start_iter(Option);
+  while((opt=option_next(Option))){
+    if(opt->mode &XBOARD){
+      format_xboard_option_line(option_line,opt);
+      gui_send(GUI,"%s",option_line);
+    }
+  }       
+  gui_send(GUI,"feature done=1"); 
+  
 }
 
 // report_best_score()
@@ -1269,30 +1290,63 @@ static void search_update() {
          if (XB->time_limit) {
 
             // fixed time per move
-
-            engine_send_queue(Engine," movetime %.0f",XB->time_max*1000.0);
+             
+             if(XB->node_rate > 0){
+                 engine_send_queue(Engine,
+                                   " nodes %.0f",
+                                   XB->time_max*((double)XB->node_rate));
+             }else{
+                 engine_send_queue(Engine,
+                                   " movetime %.0f",
+                                   XB->time_max*1000.0);
+             }
 
          } else {
 
             // time controls
 
-            if (colour_is_white(Uci->board->turn)) {
-               engine_send_queue(Engine," wtime %.0f btime %.0f",XB->my_time*1000.0,XB->opp_time*1000.0);
-            } else {
-               engine_send_queue(Engine," wtime %.0f btime %.0f",XB->opp_time*1000.0,XB->my_time*1000.0);
-            }
-
-            if (XB->inc != 0.0) engine_send_queue(Engine," winc %.0f binc %.0f",XB->inc*1000.0,XB->inc*1000.0);
-
-            if (XB->mps != 0) {
-
-               move_nb = XB->mps - (Uci->board->move_nb % XB->mps);
-               ASSERT(move_nb>=1&&move_nb<=XB->mps);
-
-               engine_send_queue(Engine," movestogo %d",move_nb);
-            }
+                 if(XB->node_rate > 0) {
+                     double time;
+                     move_nb = 40;
+                     if (XB->mps != 0){
+                         move_nb = XB->mps - (Uci->board->move_nb % XB->mps);
+                     }
+                     time = XB->my_time / move_nb;
+                     if(XB->inc != 0){
+                         time += XB->inc;
+                     }
+                     if(time > XB->my_time){
+                         time = XB->my_time;
+                     }
+                     engine_send_queue(Engine,
+                                       " nodes %.0f",
+                                       time*XB->node_rate);
+                 } else {
+                     
+                     if (colour_is_white(Uci->board->turn)) {
+                         engine_send_queue(Engine,
+                                           " wtime %.0f btime %.0f",
+                                           XB->my_time*1000.0,XB->opp_time*1000.0);
+                     } else {
+                         engine_send_queue(Engine,
+                                           " wtime %.0f btime %.0f",
+                                           XB->opp_time*1000.0,XB->my_time*1000.0);
+                     }
+                     
+                     if (XB->inc != 0.0){
+                         engine_send_queue(Engine,
+                                           " winc %.0f binc %.0f",
+                                           XB->inc*1000.0,XB->inc*1000.0);
+                     }
+                     if (XB->mps != 0) {
+
+                         move_nb = XB->mps - (Uci->board->move_nb % XB->mps);
+                         ASSERT(move_nb>=1&&move_nb<=XB->mps);
+                         
+                         engine_send_queue(Engine," movestogo %d",move_nb);
+                     }
+                 }
          }
-
          if (XB->depth_limit) engine_send_queue(Engine," depth %d",XB->depth_max);
 
          if (State->state == PONDER) engine_send_queue(Engine," ponder");