Parameter tuning, Min_Threads added

Censor · Censor · commit 0f59733234d3 · 2013-05-22T15:26:51.000-04:00
Set chess piece values to those from the GH compile of Fire 2.2.
Introduce Min_Threads and remove doubling of the CPU number to get the
number of threads. Now it is still possible to have more threads than
processors if one wants to, but such a setting is no longer the default,
which was bad.
diff --git a/src/fire.h b/src/fire.h
@@ -132,15 +132,15 @@ along with this program. If not, see http://www.gnu.org/licenses/.
 // Piece Values
 #define DEFAULT_PAWN_VALUE 100           // Original: 100; DO NOT ALTER! IT SETS THE SCALE. Yuri Censor, 03/25/2013
 #define MAX_PAWN_VALUE 200
-#define DEFAULT_KNIGHT_VALUE 320         // Original: 320; Modified: 317 (03/28/2013)
+#define DEFAULT_KNIGHT_VALUE 300         // Original: 320; Modified: 317 (03/28/2013); GH: 300 (5/21/2013)
 #define MAX_KNIGHT_VALUE 640
-#define DEFAULT_BISHOP_VALUE 330         // Original: 330; Modified: 333 (03/28/2013)
+#define DEFAULT_BISHOP_VALUE 310         // Original: 330; Modified: 333 (03/28/2013); GH: 310 (5/21/2013)
 #define MAX_BISHOP_VALUE 640
-#define DEFAULT_ROOK_VALUE 510           // Original: 510; Modified: 520 (03/28/2013)
+#define DEFAULT_ROOK_VALUE 500           // Original: 510; Modified: 520 (03/28/2013); GH: 500 (5/21/2013)
 #define MAX_ROOK_VALUE 1000
-#define DEFAULT_QUEEN_VALUE 1000          // Original: 1000; Modified: 960 (03/28/2013)
+#define DEFAULT_QUEEN_VALUE 950          // Original: 1000; Modified: 960 (03/28/2013); GH: 950 (5/21/2013)
 #define MAX_QUEEN_VALUE 2000
-#define DEFAULT_BISHOP_PAIR_VALUE 50     // Original: 50
+#define DEFAULT_BISHOP_PAIR_VALUE 45     // Original: 50; Modified: 50 (03/28/2013); GH: 45 (5/21/2013)
 #define MAX_BISHOP_PAIR_VALUE 200
 
 // Eval Weights
@@ -323,6 +323,7 @@ int MultiPV;
 int OptHashSize;
 int OptPHashSize;
 int OptMaxThreads;
+int OptMinThreads; // Added 5/22/2013 by Yuri Censor for Firenzina
 int RandRange;
 
 #if defined(_WIN32) && !defined(__GNUC__) || defined(_WIN64) && !defined(__GNUC__)
diff --git a/src/init.c b/src/init.c
@@ -183,7 +183,9 @@ static void parse_option(const char *str)
         {
         int input = atoi(arg[1]);
 		OptMaxThreads = input;
-		if (OptMaxThreads == 0)
+		if (OptMaxThreads <= 0) // Modified 5/22/2013 by Yuri Censor for Firenzina
+			OptMaxThreads = MaxCPUs;
+		else if (OptMaxThreads > MaxCPUs)
 			OptMaxThreads = MaxCPUs;
 		Send("Max Threads: %d\n", OptMaxThreads);
 		if (VerboseUCI)
@@ -196,6 +198,27 @@ static void parse_option(const char *str)
 			fprintf(log_file, "Max Threads: %d\n", OptMaxThreads);
 			close_log();
 			}
+#endif
+        }
+	if (!strcmp(arg[0], "Min_Threads")) // Added 5/22/2013 by Yuri Censor for Firenzina
+        {
+        int input = atoi(arg[1]);
+		OptMinThreads = input;
+		if (OptMinThreads <= 0)
+			OptMinThreads = 1;
+		else if (OptMinThreads > MaxCPUs)
+			OptMinThreads = MaxCPUs;
+		Send("Min Threads: %d\n", OptMinThreads);
+		if (VerboseUCI)
+			Send("info string Min Threads: %d\n", OptMinThreads);
+
+#ifdef Log
+		if (WriteLog)
+			{
+			log_file = fopen(log_filename, "a");
+			fprintf(log_file, "Min Threads: %d\n", OptMinThreads);
+			close_log();
+			}
 #endif
         }
     if (!strcmp(arg[0], "MultiPV"))
@@ -1814,6 +1837,7 @@ void gen_cfg_file(char *file_name)
     fprintf(fp, "Hash %d\n", DEFAULT_HASH_SIZE);
     fprintf(fp, "Pawn_Hash %d\n", DEFAULT_PAWN_HASH_SIZE);
     fprintf(fp, "Max_Threads %d\n", OptMaxThreads);
+	fprintf(fp, "Min_Threads %d\n", OptMinThreads); // Added 5/22/2013 by Yuri Censor for Firenzina
     fprintf(fp, "MultiPV %d\n", DEFAULT_MULTIPV);
     fprintf(fp, "Random_Range %d\n", RandRange);
 
diff --git a/src/input.c b/src/input.c
@@ -97,6 +97,7 @@ UCItype UCIOptions[256] =
 #endif
 
     { "Max_Threads", "SMP", UCISpin, 1, MaxCPUs, MaxCPUs, &OptMaxThreads, &InitSMP },
+	{ "Min_Threads", "SMP", UCISpin, 1, MaxCPUs, 1, &OptMinThreads, &InitSMP }, // Added 5/22/2013 by Yuri Censor for Firenzina
     { "MultiPV", "System", UCISpin, 1, MAX_MULTIPV, DEFAULT_MULTIPV, &MultiPV, NULL },
 // Split Depths	
     { "AN_Split_Depth", "SMP", UCISpin, MIN_AN_SPLIT_DEPTH, MAX_AN_SPLIT_DEPTH, DEFAULT_AN_SPLIT_DEPTH, &ANSplitDepth, NULL },
@@ -194,6 +195,7 @@ UCItype BaseUCIOptions[256] =
     { "Hash", "System", UCISpin, 1, MAX_HASH_SIZE, DEFAULT_HASH_SIZE, &CurrentHashSize, &InitHash },
     { "Pawn_Hash", "System", UCISpin, 1, MAX_PAWN_HASH_SIZE, DEFAULT_PAWN_HASH_SIZE, &CurrentPHashSize, &InitPawnHashWrapper },
     { "Max_Threads", "SMP", UCISpin, 1, MaxCPUs, MaxCPUs, &OptMaxThreads, &InitSMP },
+	{ "Min_Threads", "SMP", UCISpin, 1, MaxCPUs, 1, &OptMinThreads, &InitSMP }, // Added 5/22/2013 by Yuri Censor for Firenzina
     { "MultiPV", "System", UCISpin, 1, MAX_MULTIPV, DEFAULT_MULTIPV, &MultiPV, NULL },
     { "", "", -1, 0, 0, false, NULL, NULL }
     };
diff --git a/src/main.c b/src/main.c
@@ -168,6 +168,7 @@ void InitGlobals()
     MultiPV = DEFAULT_MULTIPV;
     NumThreads = 1;
     OptMaxThreads = MaxCPUs;
+	OptMinThreads = 1; // Added 5/22/2013 by Yuri Censor for Firenzina
     Ponder = false;
 	RandRange = 20;
     SearchIsDone = true;
diff --git a/src/utility.c b/src/utility.c
@@ -423,15 +423,25 @@ NumCPUs = get_nprocs();
 
 		}
 	    
-	NumThreads = NumCPUs<<1; // Modification by Yuri Censor for Firenzina, 2/16/2013
-	                         // Was: NumThreads = NumCPUs; 
-	                         // Problem: We couldn't have more threads than processors
+	NumThreads = NumCPUs; 
     if(NumThreads > MaxCPUs)
         NumThreads = MaxCPUs;
-
-    if(NumThreads > OptMaxThreads)
-        NumThreads = OptMaxThreads;
-
+	if (OptMaxThreads > OptMinThreads) // normal; Added 5/22/2013 by Yuri Censor for Firenzina
+	{
+		if(NumThreads > OptMaxThreads)
+			NumThreads = OptMaxThreads;
+		else if (NumThreads < OptMinThreads) // Added 5/22/2013 by Yuri Censor for Firenzina
+			NumThreads = OptMinThreads;
+	}
+	else if (OptMinThreads > OptMaxThreads) // abnormal; Added 5/22/2013 by Yuri Censor for Firenzina
+	{
+		if(NumThreads > OptMinThreads) // Treat OptMinThreads as OptMaxThreads and vice versa
+			NumThreads = OptMinThreads;
+		else if (NumThreads < OptMaxThreads) 
+			NumThreads = OptMaxThreads;
+	}
+	else // if (OptMinThreads == OptMaxThreads)
+		NumThreads = OptMaxThreads;
 
     if(NumThreads > 1)
 		{
