diff --git a/Reversi.xcodeproj/project.xcworkspace/xcuserdata/sasa.xcuserdatad/UserInterfaceState.xcuserstate b/Reversi.xcodeproj/project.xcworkspace/xcuserdata/sasa.xcuserdatad/UserInterfaceState.xcuserstate index f37f07e..8c16edd 100644 Binary files a/Reversi.xcodeproj/project.xcworkspace/xcuserdata/sasa.xcuserdatad/UserInterfaceState.xcuserstate and b/Reversi.xcodeproj/project.xcworkspace/xcuserdata/sasa.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Reversi/book/cow.h b/Reversi/book/cow.h index f899d19..9df28f2 100644 --- a/Reversi/book/cow.h +++ b/Reversi/book/cow.h @@ -40,7 +40,6 @@ const ankerl::unordered_dense::map, uint64_t> book const ankerl::unordered_dense::map, uint64_t> book_ura_yotto = { {std::make_pair(0x800080800, 0x101E140000), 0x20000}, - {std::make_pair(0x101A100000, 0x8040E0800), 0x8} }; diff --git a/Reversi/reversi.cpp b/Reversi/reversi.cpp index 02f7328..f3305d8 100644 --- a/Reversi/reversi.cpp +++ b/Reversi/reversi.cpp @@ -1449,8 +1449,7 @@ inline int score_fixedstone(const uint64_t &playerboard, const uint64_t &opponen } inline int countscore(const uint64_t &playerboard, const uint64_t &opponentboard, const char &afterIndex) { - return (afterIndex >= 60) ? __builtin_popcountll(playerboard) - __builtin_popcountll(opponentboard) : - (!playerboard) ? MIN_INF : + return (!playerboard) ? MIN_INF : (!opponentboard) ? MAX_INF : (afterIndex >= 41) ? score_stone(playerboard, opponentboard)*3 + score_fixedstone(playerboard, opponentboard) * 20: score_stone(playerboard, opponentboard)*3 + score_fixedstone(playerboard, opponentboard)*20 + score_putable(playerboard, opponentboard);