X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=718c78752502b61bd991b25191c94b2d30487e41;hp=ceb04dc3cf21a9f9ae92c618366c37e9fc085380;hb=258da28e79d99f75e0b626697bda2d459a37c0e6;hpb=a29dd88f7563c5af871d9adc137218c39586b09c

diff --git a/src/uci.cpp b/src/uci.cpp
index ceb04dc3..718c7875 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -20,7 +20,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-#include <vector>
 
 #include "evaluate.h"
 #include "misc.h"
@@ -84,9 +83,6 @@ void uci_loop() {
       else if (token == "go")
           go(pos, is);
 
-      else if (token == "ucinewgame")
-          pos.from_fen(StartFEN, false);
-
       else if (token == "isready")
           cout << "readyok" << endl;
 
@@ -106,10 +102,7 @@ void uci_loop() {
           pos.flip_me();
 
       else if (token == "eval")
-      {
-          read_evaluation_uci_options(pos.side_to_move());
-          cout << trace_evaluate(pos) << endl;
-      }
+          cout << Eval::trace(pos) << endl;
 
       else if (token == "key")
           cout << "key: " << hex     << pos.key()
@@ -182,14 +175,10 @@ namespace {
     while (is >> token)
         value += string(" ", !value.empty()) + token;
 
-    if (!Options.count(name))
-        cout << "No such option: " << name << endl;
-
-    else if (value.empty()) // UCI buttons don't have a value
-        Options[name] = true;
-
-    else
+    if (Options.count(name))
         Options[name] = value;
+    else
+        cout << "No such option: " << name << endl;
   }
 
 
@@ -244,19 +233,19 @@ namespace {
 
   void perft(Position& pos, istringstream& is) {
 
-    int depth, time;
+    int depth;
 
     if (!(is >> depth))
         return;
 
-    time = system_time();
+    Time time = Time::current_time();
 
     int64_t n = Search::perft(pos, depth * ONE_PLY);
 
-    time = system_time() - time;
+    int e = time.elapsed();
 
     std::cout << "\nNodes " << n
-              << "\nTime (ms) " << time
-              << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
+              << "\nTime (ms) " << e
+              << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
   }
 }