Fix a warning under Intel compiler in square.h

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 237ca8d7d8d9525c7a7dc301f44a2695015352ac..68f6103c651b0d467072edcd15812939fead7f44 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -1,13 +1,14 @@
 /*
-  Glaurung, a UCI chess playing engine.
-  Copyright (C) 2004-2008 Tord Romstad
+  Stockfish, a UCI chess playing engine derived from Glaurung 2.1
+  Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
+  Copyright (C) 2008 Marco Costalba
 
-  Glaurung is free software: you can redistribute it and/or modify
+  Stockfish is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Glaurung is distributed in the hope that it will be useful,
+  Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
@@ -36,6 +37,7 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp);
 
 #endif
 
+#include <cassert>
 #include <cstdio>
 #include <iomanip>
 #include <iostream>
@@ -48,14 +50,57 @@ int gettimeofday(struct timeval * tp, struct timezone * tzp);
 //// Variables
 ////
 
+static const std::string AppName = "Stockfish";
+static const std::string AppTag  = "";
+
 long dbg_cnt0 = 0;
 long dbg_cnt1 = 0;
 
+bool dbg_show_mean = false;
+bool dbg_show_hit_rate = false;
+
 
 ////
 //// Functions
 ////
 
+void dbg_hit_on(bool b) {
+
+    assert(!dbg_show_mean);
+    dbg_show_hit_rate = true;
+    dbg_cnt0++;
+    if (b)
+        dbg_cnt1++;
+}
+
+void dbg_hit_on_c(bool c, bool b) {
+
+    if (c)
+        dbg_hit_on(b);
+}
+
+void dbg_before() {
+
+    assert(!dbg_show_mean);
+    dbg_show_hit_rate = true;
+    dbg_cnt0++;
+}
+
+void dbg_after() {
+
+    assert(!dbg_show_mean);
+    dbg_show_hit_rate = true;
+    dbg_cnt1++;
+}
+
+void dbg_mean_of(int v) {
+
+    assert(!dbg_show_hit_rate);
+    dbg_show_mean = true;
+    dbg_cnt0++;
+    dbg_cnt1 += v;
+}
+
 void dbg_print_hit_rate() {
 
   std::cout << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1
@@ -63,9 +108,28 @@ void dbg_print_hit_rate() {
             << std::endl;
 }
 
-/// engine_name() returns the full name of the current Glaurung version.
-/// This will be either "Glaurung YYMMDD" (where YYMMDD is the date when the
-/// program was compiled) or "Glaurung <version number>", depending on whether
+void dbg_print_mean() {
+
+  std::cout << "Total " << dbg_cnt0 << " Mean "
+            << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << std::endl;
+}
+
+void dbg_print_hit_rate(std::ofstream& logFile) {
+
+  logFile << "Total " << dbg_cnt0 << " Hit " << dbg_cnt1
+          << " hit rate (%) " << (dbg_cnt1*100)/(dbg_cnt0 ? dbg_cnt0 : 1)
+          << std::endl;
+}
+
+void dbg_print_mean(std::ofstream& logFile) {
+
+  logFile << "Total " << dbg_cnt0 << " Mean "
+          << (float)dbg_cnt1 / (dbg_cnt0 ? dbg_cnt0 : 1) << std::endl;
+}
+
+/// engine_name() returns the full name of the current Stockfish version.
+/// This will be either "Stockfish YYMMDD" (where YYMMDD is the date when the
+/// program was compiled) or "Stockfish <version number>", depending on whether
 /// the constant EngineVersion (defined in misc.h) is empty.
 
 const std::string engine_name() {
@@ -78,12 +142,16 @@ const std::string engine_name() {
       size_t mon = 1 + months.find(date.substr(0, 3)) / 4;
 
       std::stringstream s;
-      s << "Glaurung clone " << date.substr(date.length() - 2) << std::setfill('0')
-        << std::setw(2) << mon << date.substr(4, 2);
+      std::string day = (date[4] == ' ' ? date.substr(5, 1) : date.substr(4, 2));
+
+      std::string name = AppName + " " + AppTag + " ";
+
+      s << name << date.substr(date.length() - 2) << std::setfill('0')
+        << std::setw(2) << mon << std::setw(2) << day;
 
       return s.str();
   } else
-      return "Glaurung clone " + EngineVersion;
+      return "Stockfish " + EngineVersion;
 }