diff --git a/src/All/makeAll.bat b/src/All/makeAll.bat index 7c2a3df..9e1ec9c 100644 --- a/src/All/makeAll.bat +++ b/src/All/makeAll.bat @@ -3,40 +3,40 @@ ren C:\MinGW\mingw64-730-pse mingw64 make clean mingw32-make profile-build ARCH=x86-64 COMP=mingw CXX=x86_64-w64-mingw32-g++ -j14 strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-x86-64.exe" +ren shashchess.exe "ShashChess 6.1.3-x86-64.exe" make clean mingw32-make profile-build ARCH=x86-64-modern COMP=mingw CXX=x86_64-w64-mingw32-g++ -j14 strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-x86-64-modern.exe" +ren shashchess.exe "ShashChess 6.1.3-x86-64-modern.exe" make clean mingw32-make profile-build ARCH=x86-64-bmi2 COMP=mingw CXX=x86_64-w64-mingw32-g++ -j14 strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-x86-64-bmi2.exe" +ren shashchess.exe "ShashChess 6.1.3-x86-64-bmi2.exe" mingw32-make build ARCH=ppc-64 COMP=mingw strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-ppc-64.exe" +ren shashchess.exe "ShashChess 6.1.3-ppc-64.exe" make clean mingw32-make profile-build ARCH=general-64 COMP=mingw CXX=x86_64-w64-mingw32-g++ -j14 strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-general-64.exe" +ren shashchess.exe "ShashChess 6.1.3-general-64.exe" make clean ren C:\MinGW\mingw64 mingw64-730-pse ren C:\MinGW\mingw32-730-pd mingw32 mingw32-make build ARCH=ppc-32 COMP=mingw strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-ppc-32.exe" +ren shashchess.exe "ShashChess 6.1.3-ppc-32.exe" make clean mingw32-make -f MakeFile profile-build ARCH=general-32 COMP=mingw strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-general-32.exe" +ren shashchess.exe "ShashChess 6.1.3-general-32.exe" make clean mingw32-make -f MakeFile profile-build ARCH=x86-32 COMP=mingw strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-x86-32.exe" +ren shashchess.exe "ShashChess 6.1.3-x86-32.exe" make clean mingw32-make -f MakeFile profile-build ARCH=x86-32-old COMP=mingw strip shashchess.exe -ren shashchess.exe "ShashChess 6.1.2-x86-32-old.exe" +ren shashchess.exe "ShashChess 6.1.3-x86-32-old.exe" make clean ren C:\MinGW\mingw32 mingw32-730-pd pause \ No newline at end of file diff --git a/src/All/makeAll.sh b/src/All/makeAll.sh index 2af8511..90168cf 100644 --- a/src/All/makeAll.sh +++ b/src/All/makeAll.sh @@ -1,44 +1,44 @@ make build ARCH=x86-64 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-x86-64' +mv 'shashchess' 'ShashChess 6.1.3-x86-64' make clean make build ARCH=x86-64-modern COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-x86-64-modern' +mv 'shashchess' 'ShashChess 6.1.3-x86-64-modern' make clean make build ARCH=x86-64-bmi2 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-x86-64-bmi2' +mv 'shashchess' 'ShashChess 6.1.3-x86-64-bmi2' make clean make build ARCH=x86-32 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-x86-32' +mv 'shashchess' 'ShashChess 6.1.3-x86-32' make clean make build ARCH=x86-32-old COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-x86-32-old' +mv 'shashchess' 'ShashChess 6.1.3-x86-32-old' make clean make build ARCH=ppc-64 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-ppc-64' +mv 'shashchess' 'ShashChess 6.1.3-ppc-64' make clean make build ARCH=ppc-32 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-ppc-32' +mv 'shashchess' 'ShashChess 6.1.3-ppc-32' make clean make build ARCH=general-64 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-general-64' +mv 'shashchess' 'ShashChess 6.1.3-general-64' make clean make build ARCH=general-32 COMPCC=gcc-7.3.0 strip shashchess -mv 'shashchess' 'ShashChess 6.1.2-general-32' +mv 'shashchess' 'ShashChess 6.1.3-general-32' make clean diff --git a/src/All/misc.cpp b/src/All/misc.cpp index 4e53f12..9826fd1 100644 --- a/src/All/misc.cpp +++ b/src/All/misc.cpp @@ -56,7 +56,7 @@ namespace { /// Version number. If Version is left empty, then compile date in the format /// DD-MM-YY and show in engine_info. -const string Version = "6.1.2"; +const string Version = "6.1.3"; /// Our fancy logging facility. The trick here is to replace cin.rdbuf() and /// cout.rdbuf() with two Tie objects that tie cin and cout to a file stream. We diff --git a/src/All/uci.cpp b/src/All/uci.cpp index b51dcbf..b0e1f49 100644 --- a/src/All/uci.cpp +++ b/src/All/uci.cpp @@ -56,73 +56,91 @@ namespace { Move m; string token, fen; - string Newfen; //kellykanyama mcts - + string Newfen; //kellykanyama mcts + bool mcts=Options["MCTS"]; is >> token; - if (token == "startpos") - { - startposition = true; //kellykynyama mcts begin - fen = StartFEN; - Newfen = fen; //kellykynyama mcts - is >> token; // Consume "moves" token if any - } - else if (token == "fen") - { - //kellykynyama mcts begin - startposition = false; - Newfen = token; - //kellykynyama mcts end - while (is >> token && token != "moves") - fen += token + " "; - } - else - return; + if (token == "startpos") + { + //kellykynyama mcts begin + if(mcts) + { + startposition = true; + Newfen = fen; + } + //kellykynyama end + fen = StartFEN; + is >> token; // Consume "moves" token if any + } + else if (token == "fen") + { + //kellykynyama mcts begin + if(mcts) + { + startposition = false; + Newfen = token; + } + //kellykynyama mcts end + while (is >> token && token != "moves") + fen += token + " "; + } + else + return; states = StateListPtr(new std::deque(1)); // Drop old and create a new one pos.set(fen, Options["UCI_Chess960"], &states->back(), Threads.main()); - //kellykynyama mcts begin - int movesplayed = 0; - int OPmoves = 0; - - if (StartFEN != Newfen) - { - startposition = false; - FileKey = pos.key(); - } - else - { - startposition = true; - FileKey = 0; - } - //kellykynyama mcts end + //kellykynyama mcts begin + int movesplayed = 0; + int OPmoves = 0; + if(mcts) + { + if (StartFEN != Newfen) + { + startposition = false; + FileKey = pos.key(); + } + else + { + startposition = true; + FileKey = 0; + } + } + //kellykynyama mcts end // Parse move list (if any) while (is >> token && (m = UCI::to_move(pos, token)) != MOVE_NONE) { states->emplace_back(); - //kellykynyama mcts begin - if (!FileKey) - { - if ((movesplayed == 2 || movesplayed == 4 || movesplayed == 6 || movesplayed == 8 || movesplayed == 10 || movesplayed == 12 || movesplayed == 14 || movesplayed == 16) && Newfen == StartFEN) - { - files(OPmoves, pos.key()); - OPmoves++; - kelly(startposition); - - } - if (movesplayed == 16 && Newfen == StartFEN) - { - FileKey = pos.key(); - kelly(startposition); - } - } - //kellykyniama mcts end + //kellykynyama mcts begin + if(mcts) + { + if (!FileKey) + { + if ((movesplayed == 2 || movesplayed == 4 || movesplayed == 6 || movesplayed == 8 || movesplayed == 10 || movesplayed == 12 || movesplayed == 14 || movesplayed == 16) && Newfen == StartFEN) + { + files(OPmoves, pos.key()); + OPmoves++; + kelly(startposition); + + } + if (movesplayed == 16 && Newfen == StartFEN) + { + FileKey = pos.key(); + kelly(startposition); + } + } + } + //kellykyniama mcts end pos.do_move(m, states->back()); - movesplayed++; //kellykyniama mcts - } + //kellykyniama mcts begin + if(mcts) + { + movesplayed++; + } + //kellykyniama mcts end + } }