X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=option.c;h=44d5c83cb20b2adf1217bafea87d484e65c1d48c;hb=5eed4adb3552562329c0b0b460c8851efb1a38bb;hp=fbf71eff5782ee36302da795725febb75f941be3;hpb=e15efca6667b2673b4c1a5879a6917eab6800e58;p=polyglot.git

diff --git a/option.c b/option.c
index fbf71ef..44d5c83 100644
--- a/option.c
+++ b/option.c
@@ -17,17 +17,22 @@ static const bool UseDebug = FALSE;
 // variables
 
 #define NNB { NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL }
-option_t Option[] = {
 
+option_list_t Option[1];
+
+option_t DefaultOptions[] = {    
     { "OptionFile",       "string","0","0",     "polyglot.ini", NULL,0,NNB,  PG}, 
 
    // options
 
+    { "SaveSettingsOnExit","check","0","0",      "true"     , NULL,0,NNB,  PG|XBOARD}, 
+    { "SaveFile",         "string","0","0",     "<empty>"   , NULL,0,NNB,  PG|XBOARD},
+    
     { "EngineName",       "string","0","0",     "<empty>"   , NULL,0,NNB,  PG}, 
     { "EngineDir",        "string","0","0",     "."         , NULL,0,NNB,  PG}, 
     { "EngineCommand",    "string","0","0",     "<empty>"   , NULL,0,NNB,  PG}, 
 
-    { "Log",              "check","0","0",     "false"      , NULL,0,NNB,  PG|XBOARD|UCI}, 
+    { "Log",              "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD|UCI}, 
     { "LogFile",          "string","0","0",     "polyglot.log", NULL,0,NNB,  PG|XBOARD|UCI}, 
 
     { "UCI",              "check","0","0",      "false"     , NULL,0,NNB,  PG}, 
@@ -35,26 +40,28 @@ option_t Option[] = {
     { "UseNice",          "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD|UCI}, 
     { "NiceValue",        "spin", "0","20",     "5"         , NULL,0,NNB,  PG|XBOARD|UCI}, 
 
-    { "Chess960",         "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
+    { "Chess960",         "check","0","0",      "false"     , NULL,0,NNB,  PG}, 
 
     { "Resign",           "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
     { "ResignMoves",      "spin","0","10000",    "3"        , NULL,0,NNB,  PG|XBOARD}, 
     { "ResignScore",      "spin","0","10000",   "600"       , NULL,0,NNB,  PG|XBOARD}, 
 
-    { "MateScore",        "spin","0","1000000", "10000"     , NULL,0,NNB,  PG|XBOARD}, 
+    { "MateScore",        "spin","0","100000",  "10000"     , NULL,0,NNB,  PG|XBOARD}, 
 
     { "Book",             "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD|UCI}, 
     { "BookFile",         "string","0","0",     "book.bin"  , NULL,0,NNB,  PG|XBOARD|UCI}, 
 
     { "BookRandom",       "check","0","0",      "true"      , NULL,0,NNB,  PG|XBOARD|UCI}, 
+    { "BookDepth",        "spin","0","256",     "256"       , NULL,0,NNB,  PG|XBOARD}, 
+    { "BookTreshold",     "spin","0","1000",    "5"         , NULL,0,NNB,  PG|XBOARD|UCI}, 
     { "BookLearn",        "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
 
     { "KibitzMove",       "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
     { "KibitzPV",         "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
 
     { "KibitzCommand",    "string","0","0",     "tellall"   , NULL,0,NNB,  PG|XBOARD}, 
-    { "KibitzDelay",      "spin","0","10000",  "5"         , NULL,0,NNB,  PG|XBOARD}, 
-    { "KibitzInterval",   "spin","0","10000",  "0"         , NULL,0,NNB,  PG|XBOARD}, 
+    { "KibitzDelay",      "spin","0","1000",    "5"         , NULL,0,NNB,  PG|XBOARD}, 
+    { "KibitzInterval",   "spin","0","1000",    "0"         , NULL,0,NNB,  PG|XBOARD}, 
 
     { "ShowPonder",       "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
     { "ScoreWhite",       "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
@@ -64,41 +71,99 @@ option_t Option[] = {
     { "UCIVersion",       "spin","1","2",       "2"         , NULL,0,NNB,  PG|XBOARD}, 
     { "CanPonder",        "check","1","2",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
     { "SyncStop",         "check","1","2",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
-    { "Affinity",	      "spin","-1","32",     "-1"        , NULL,0,NNB,  PG}, 
-    { "RepeatPV",	      "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD},
+    { "Affinity",         "spin","-1","32",     "-1"        , NULL,0,NNB,  PG}, 
+    { "RepeatPV",         "check","0","0",      "true"      , NULL,0,NNB,  PG|XBOARD},
     { "PromoteWorkAround","check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
 
+    { "WbWorkArounds",    "check","0","0",      "true"      , NULL,0,NNB,  PG|XBOARD}, 
+    { "WbWorkArounds2",   "check","0","0",      "false"     , NULL,0,NNB,  PG|XBOARD}, 
     { NULL,               NULL,"0","0",         NULL        , NULL,0,NNB,  0},
-};
 
-// prototypes
+};
 
-static option_t * option_find (const char var[]);
 
 // functions
 
-// option_init()
-
-void option_init() {
+// option_is_ok()
 
-    option_t *p=Option;
-    const char * name;
+bool option_is_ok(const option_list_t *option) {
+    if(option->option_nb<0 || option->option_nb>=OptionNb){
+        return FALSE;
+    }
+    return TRUE;
+}
 
-    while((name=(p++)->name)){
-        option_set(name,option_get_default(name));
+// option_init_pg()
+
+void option_init_pg() {
+
+    int i;
+    option_t *p=DefaultOptions;
+    
+    option_init(Option);
+    while(p){
+        if(p->name){
+            option_insert(Option,p);
+            p++;
+        }else{
+            break;
+        }
     }
+    for(i=0;i<Option->option_nb;i++){
+        Option->options[i].value=my_strdup(Option->options[i].default_);
+    }
+}
+
+// option_init()
+
+void option_init(option_list_t *option){
+    ASSERT(option!=NULL);
+    option->option_nb=0;
+    option->iter=0;
+    memset(option->options,0,sizeof(option->options));
 }
 
+// option_insert()
+
+void option_insert(option_list_t *option, option_t *new_option){
+    int i;
+    option_t *opt;
+    ASSERT(option!=NULL);
+    ASSERT(new_option!=NULL);
+    ASSERT(new_option->name!=NULL);
+    opt=option_find(option,new_option->name);
+    if(!opt){
+        opt=&option->options[option->option_nb];
+        option->option_nb++;
+    }
+    if(option->option_nb>=OptionNb){
+        my_fatal("option_insert(): option list overflow\n");
+    }
+    if(new_option->name)     my_string_set(&opt->name,     new_option->name);
+    if(new_option->value)    my_string_set(&opt->value,    new_option->value);
+    if(new_option->min)      my_string_set(&opt->min,      new_option->min);
+    if(new_option->max)      my_string_set(&opt->max,      new_option->max);
+    if(new_option->default_) my_string_set(&opt->default_, new_option->default_);
+    if(new_option->type)     my_string_set(&opt->type,     new_option->type);
+    opt->var_nb=new_option->var_nb;
+    for(i=0;i<new_option->var_nb;i++){
+        my_string_set(&opt->var[i], new_option->var[i]);
+    }
+    opt->mode=new_option->mode;
+}
 
 // option_set()
 
-bool option_set(const char name[], const char value[]) {
+bool option_set(option_list_t *option, 
+                const char name[], 
+                const char value[]) {
 
    option_t * opt;
+   ASSERT(option!=NULL);
    ASSERT(name!=NULL);
    ASSERT(value!=NULL);
 
-   opt = option_find(name);
+   opt = option_find(option,name);
    if (opt == NULL) return FALSE;
 
    my_string_set(&opt->value,value);
@@ -107,18 +172,21 @@ bool option_set(const char name[], const char value[]) {
 
    return TRUE;
 }
-// option_set()
 
-bool option_set_default(const char name[], const char value[]) {
+// option_set_default()
+
+bool option_set_default(option_list_t *option,
+                           const char name[], 
+                           const char value[]) {
 
    option_t * opt;
    ASSERT(name!=NULL);
    ASSERT(value!=NULL);
 
-   opt = option_find(name);
+   opt = option_find(option,name);
    if (opt == NULL) return FALSE;
 
-   opt->default_=my_strdup(value);
+   my_string_set(&opt->default_,value);
 
    if (UseDebug) my_log("POLYGLOT OPTION DEFAULT SET \"%s\" -> \"%s\"\n",opt->name,opt->default_);
 
@@ -127,15 +195,14 @@ bool option_set_default(const char name[], const char value[]) {
 
 // option_get()
 
-const char * option_get(const char name[]) {
+const char * option_get(option_list_t *option, const char name[]) {
 
    option_t * opt;
 
    ASSERT(name!=NULL);
 
-   opt = option_find(name);
+   opt = option_find(option,name);
    if (opt == NULL) my_fatal("option_get(): unknown option \"%s\"\n",name);
-
    if (UseDebug) my_log("POLYGLOT OPTION GET \"%s\" -> \"%s\"\n",opt->name,opt->value);
 
    return opt->value;
@@ -143,13 +210,13 @@ const char * option_get(const char name[]) {
 
 // option_get_default()
 
-const char * option_get_default(const char name[]) {
+const char * option_get_default(option_list_t *option, const char name[]) {
 
    option_t * opt;
 
    ASSERT(name!=NULL);
 
-   opt = option_find(name);
+   opt = option_find(option,name);
    if (opt == NULL) my_fatal("option_get(): unknown option \"%s\"\n",name);
 
    if (UseDebug) my_log("POLYGLOT OPTION GET \"%s\" -> \"%s\"\n",opt->name,opt->value);
@@ -159,11 +226,11 @@ const char * option_get_default(const char name[]) {
 
 // option_get_bool()
 
-bool option_get_bool(const char name[]) {
+bool option_get_bool(option_list_t *option, const char name[]) {
 
    const char * value;
 
-   value = option_get(name);
+   value = option_get(option,name);
 
    if (FALSE) {
    } else if (my_string_case_equal(value,"true") || my_string_case_equal(value,"yes") || my_string_equal(value,"1")) {
@@ -177,53 +244,111 @@ bool option_get_bool(const char name[]) {
    return FALSE;
 }
 
+
 // option_get_double()
 
-double option_get_double(const char name[]) {
+double option_get_double(option_list_t *option, const char name[]) {
 
    const char * value;
 
-   value = option_get(name);
+   value = option_get(option,name);
 
    return atof(value);
 }
 
 // option_get_int()
 
-int option_get_int(const char name[]) {
+int option_get_int(option_list_t *option, const char name[]) {
 
    const char * value;
 
-   value = option_get(name);
+   value = option_get(option,name);
 
    return atoi(value);
 }
 
 // option_get_string()
 
-const char * option_get_string(const char name[]) {
+const char * option_get_string(option_list_t *option, const char name[]) {
 
    const char * value;
 
-   value = option_get(name);
+   value = option_get(option,name);
 
    return value;
 }
 
 // option_find()
 
-static option_t * option_find(const char name[]) {
+option_t * option_find(option_list_t *option, const char name[]) {
 
    option_t * opt;
+   int i;
 
    ASSERT(name!=NULL);
+   for (i=0; i<option->option_nb; i++){
+       opt=option->options+i;
+       if (my_string_case_equal(opt->name,name)){
+           return opt;
+       }
+   }
+   
+   return NULL;
+}
+
+// option_start_iter()
+
+void option_start_iter(option_list_t *option){
+    option->iter=0;
+}
+
+// option_next()
 
+option_t * option_next(option_list_t *option){
+    ASSERT(option->iter<=option->option_nb);
+    if(option->iter==option->option_nb){
+        return NULL;
+    }
+    return &option->options[option->iter++];
+        
+}
+
+void option_free(option_t *option){
+      int i;
+      my_string_clear(&option->name);
+      my_string_clear(&option->type);
+      my_string_clear(&option->min);
+      my_string_clear(&option->max);
+      my_string_clear(&option->default_);
+      my_string_clear(&option->value);
+      for(i=0;i<option->var_nb;i++){
+         my_string_clear(&option->var[i]);
+      }
+      option->var_nb=0;
+      option->mode=0;
+}
+
+// option_clear()
 
-   for (opt = &Option[0]; opt->name != NULL; opt++) {
-      if (my_string_case_equal(opt->name,name)) return opt;
+void option_clear(option_list_t *option){
+    int i;
+    for (i = 0; i < option->option_nb; i++) {
+        option_free(option->options+i);
    }
+   option->option_nb=0;
+}
 
-   return NULL;
+// option_from_ini()
+
+void option_from_ini(option_list_t *option,
+                     ini_t *ini,
+                     const char *section){
+    ini_entry_t *entry;
+    ini_start_iter(ini);
+    while((entry=ini_next(ini))){
+        option_set(option,entry->name,entry->value);
+        option_set_default(option,entry->name,entry->value);
+    }
 }
 
 // end of option.cpp