WebSVN – Games.Chess Giants – Diff – /engine-crafty/option.c

     if (nargs != 6) {
       printf("usage:  adaptive NPS hmin hmax pmin pmax\n");
       return 1;
+    }
     if (nargs > 1) {
-      adaptive_hash = atoiKMB(args[1]);
+      adaptive_hash = (int) atoiKMB(args[1]); // Pierre-Marie Baty -- added type cast
-      adaptive_hash_min = atoiKMB(args[2]);
+      adaptive_hash_min = (size_t) atoiKMB(args[2]); // Pierre-Marie Baty -- added type cast
-      adaptive_hash_max = atoiKMB(args[3]);
+      adaptive_hash_max = (size_t) atoiKMB(args[3]); // Pierre-Marie Baty -- added type cast
-      adaptive_hashp_min = atoiKMB(args[4]);
+      adaptive_hashp_min = (size_t) atoiKMB(args[4]); // Pierre-Marie Baty -- added type cast
-      adaptive_hashp_max = atoiKMB(args[5]);
+      adaptive_hashp_max = (size_t) atoiKMB(args[5]); // Pierre-Marie Baty -- added type cast
+    }
     Print(32, "adaptive estimated NPS =  %s\n", DisplayKMB(adaptive_hash, 1));
     Print(32, "adaptive minimum hsize =  %s\n", DisplayKMB(adaptive_hash_min,
 ));
     Print(32, "adaptive maximum hsize =  %s\n", DisplayKMB(adaptive_hash_max,
  ************************************************************
  */
   else if (OptionMatch("bookw", *args)) {
     if (nargs > 1) {
       if (OptionMatch("frequency", args[1]))
-        book_weight_freq = atof(args[2]);
+        book_weight_freq = (float) atof(args[2]); // Pierre-Marie Baty -- added type cast
       else if (OptionMatch("evaluation", args[1]))
-        book_weight_eval = atof(args[2]);
+        book_weight_eval = (float) atof(args[2]); // Pierre-Marie Baty -- added type cast
       else if (OptionMatch("learning", args[1]))
-        book_weight_learn = atof(args[2]);
+        book_weight_learn = (float) atof(args[2]); // Pierre-Marie Baty -- added type cast
     } else {
       Print(32, "frequency (freq)..............%4.2f\n", book_weight_freq);
       Print(32, "static evaluation (eval)......%4.2f\n", book_weight_eval);
       Print(32, "learning (learn)..............%4.2f\n", book_weight_learn);
+    }
       return 2;
     if (nargs > 1) {
       allow_memory = 0;
       if (xboard)
         Print(4095, "Warning--  xboard 'memory' option disabled\n");
-      new_hash_size = atoiKMB(args[1]);
+      new_hash_size = (size_t) atoiKMB(args[1]); // Pierre-Marie Baty -- added type cast
       if (new_hash_size < 64 * 1024) {
         printf("ERROR.  Minimum hash table size is 64K bytes.\n");
         return 1;
+      }
       hash_table_size = ((1ull) << MSB(new_hash_size)) / 16;
     size_t old_hash_size = hash_path_size, new_hash_size;
     if (thinking || pondering)
       return 2;
     if (nargs > 1) {
-      new_hash_size = atoiKMB(args[1]);
+      new_hash_size = (size_t) atoiKMB(args[1]); // Pierre-Marie Baty -- added type cast
       if (new_hash_size < 64 * 1024) {
         printf("ERROR.  Minimum phash table size is 64K bytes.\n");
         return 1;
+      }
       hash_path_size = ((1ull) << MSB(new_hash_size / sizeof(HPATH_ENTRY)));
       return 2;
     if (nargs > 1) {
       allow_memory = 0;
       if (xboard)
         Print(4095, "Warning--  xboard 'memory' option disabled\n");
-      new_hash_size = atoiKMB(args[1]);
+      new_hash_size = (size_t) atoiKMB(args[1]); // Pierre-Marie Baty -- added type cast
       if (new_hash_size < 16 * 1024) {
         printf("ERROR.  Minimum pawn hash table size is 16K bytes.\n");
         return 1;
+      }
       pawn_hash_table_size =
       int optimal_hash_size;
       TimeSet(think);
       time_limit /= 100;
       positions_per_move = time_limit * adaptive_hash / 16;
-      optimal_hash_size = positions_per_move * 16;
+      optimal_hash_size = (int) (positions_per_move * 16); // Pierre-Marie Baty -- added type cast
       printf("optimal=%d\n", optimal_hash_size);
-      optimal_hash_size = Max(optimal_hash_size, adaptive_hash_min);
+      optimal_hash_size = Max(optimal_hash_size, (int) adaptive_hash_min); // Pierre-Marie Baty -- added type cast
-      optimal_hash_size = Min(optimal_hash_size, adaptive_hash_max);
+      optimal_hash_size = Min(optimal_hash_size, (int) adaptive_hash_max); // Pierre-Marie Baty -- added type cast
       sprintf(buffer, "hash=%d\n", optimal_hash_size);
       Option(tree);
       percent =
           (float) (optimal_hash_size -
           adaptive_hash_min) / (float) (adaptive_hash_max -
           adaptive_hash_min);
-      optimal_hash_size =
+      optimal_hash_size = (int) // Pierre-Marie Baty -- added type cast
-          adaptive_hashp_min + percent * (adaptive_hashp_max -
+          (adaptive_hashp_min + percent * (adaptive_hashp_max -
-          adaptive_hashp_min);
+          adaptive_hashp_min));
-      optimal_hash_size = Max(optimal_hash_size, adaptive_hashp_min);
+      optimal_hash_size = Max(optimal_hash_size, (int) adaptive_hashp_min); // Pierre-Marie Baty -- added type cast
       sprintf(buffer, "hashp=%d\n", optimal_hash_size);
       Option(tree);
+    }
+  }
 /*
         mode = tournament_mode;
         printf("use 'settc' command if a game is restarted after Crafty\n");
         printf("has been terminated for any reason.\n");
       } else if (!strcmp(args[1], "normal")) {
         mode = normal_mode;
-        book_weight_learn = 1.0;
+        book_weight_learn = 1.0f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_freq = 1.0;
+        book_weight_freq = 1.0f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_eval = 0.5;
+        book_weight_eval = 0.5f; // Pierre-Marie Baty -- fixed constant truncation
       } else if (!strcmp(args[1], "match")) {
         mode = normal_mode;
-        book_weight_learn = 1.0;
+        book_weight_learn = 1.0f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_freq = 0.2;
+        book_weight_freq = 0.2f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_eval = 0.1;
+        book_weight_eval = 0.1f; // Pierre-Marie Baty -- fixed constant truncation
       } else {
         printf("usage:  mode normal|tournament|match\n");
         mode = normal_mode;
-        book_weight_learn = 1.0;
+        book_weight_learn = 1.0f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_freq = 1.0;
+        book_weight_freq = 1.0f; // Pierre-Marie Baty -- fixed constant truncation
-        book_weight_eval = 0.5;
+        book_weight_eval = 0.5f; // Pierre-Marie Baty -- fixed constant truncation
+      }
+    }
     if (mode == tournament_mode)
       printf("tournament mode.\n");
     else if (mode == normal_mode)
   else if (OptionMatch("noise", *args)) {
     if (nargs < 2) {
       printf("usage:  noise <n>\n");
       return 1;
+    }
-    noise_level = atof(args[1]) * 100;
+    noise_level = (unsigned int) (atof(args[1]) * 100); // Pierre-Marie Baty -- added type cast
     Print(32, "noise level set to %.2f seconds.\n",
         (float) noise_level / 100.0);
+  }
 /*
  ************************************************************
       return 3;
     allow_cores = 0;
     if (xboard)
       Print(4095, "Warning--  xboard 'cores' option disabled\n");
     smp_max_threads = atoi(args[1]);
-    if (smp_max_threads > hardware_processors) {
+    if (smp_max_threads > (int) hardware_processors) { // Pierre-Marie Baty -- added type cast
       Print(4095, "ERROR - machine has %d processors.\n",
           hardware_processors);
       Print(4095, "ERROR - max threads can not exceed this limit.\n");
       smp_max_threads = hardware_processors;
+    }
   else if (OptionMatch("st", *args)) {
     if (nargs < 2) {
       printf("usage:  st <time>\n");
       return 1;
+    }
-    search_time_limit = atof(args[1]) * 100;
+    search_time_limit = (int) (atof(args[1]) * 100); // Pierre-Marie Baty -- added type cast
     Print(32, "search time set to %.2f.\n",
         (float) search_time_limit / 100.0);
+  }
 /*
  ************************************************************

Subversion Repositories Games.Chess Giants

Games.Chess Giants/engine-crafty/option.c – Rev 154 → 156