- string ttSize = argc > 2 ? argv[2] : "128";
- string threads = argc > 3 ? argv[3] : "1";
- string valStr = argc > 4 ? argv[4] : "12";
- string fenFile = argc > 5 ? argv[5] : "default";
- string valType = argc > 6 ? argv[6] : "depth";
-
- Options["Hash"].set_value(ttSize);
- Options["Threads"].set_value(threads);
- Options["OwnBook"].set_value("false");
-
- // Search should be limited by nodes, time or depth ?
- if (valType == "nodes")
- limits.maxNodes = atoi(valStr.c_str());
- else if (valType == "time")
- limits.maxTime = 1000 * atoi(valStr.c_str()); // maxTime is in ms
+ string ttSize = (is >> token) ? token : "32";
+ string threads = (is >> token) ? token : "1";
+ string limit = (is >> token) ? token : "12";
+ string fenFile = (is >> token) ? token : "default";
+ string limitType = (is >> token) ? token : "depth";
+
+ Options["Hash"] = ttSize;
+ Options["Threads"] = threads;
+ TT.clear();
+
+ if (limitType == "time")
+ limits.movetime = 1000 * atoi(limit.c_str()); // movetime is in ms
+
+ else if (limitType == "nodes")
+ limits.nodes = atoi(limit.c_str());
+
+ else if (limitType == "mate")
+ limits.mate = atoi(limit.c_str());
+