From 3da72c59d548b1be99079eec3a2d0ab30f7c30fa Mon Sep 17 00:00:00 2001 From: Calcitem Date: Sun, 31 Dec 2023 19:33:56 +0800 Subject: [PATCH] Format Change-Id: Ifcbff5b7554aba0cd2b921d07f9b157ac85c7e3a --- src/movegen.h | 5 +---- src/perfect/perfect_adaptor.cpp | 9 +++++---- src/perfect/perfect_api.h | 4 ++-- src/perfect/perfect_player.h | 11 ++++++----- src/perfect/perfect_test.cpp | 8 ++++---- src/thread.cpp | 3 +-- .../lib/game_page/services/engine/engine.dart | 11 +++++++---- .../widgets/general_settings_page.dart | 3 +-- .../lib/rule_settings/widgets/rule_settings_page.dart | 3 +-- 9 files changed, 28 insertions(+), 29 deletions(-) diff --git a/src/movegen.h b/src/movegen.h index e68f571dcb..222413c899 100644 --- a/src/movegen.h +++ b/src/movegen.h @@ -69,10 +69,7 @@ struct MoveList return std::find(begin(), end(), move) != end(); } - ExtMove getMove(int index) - { - return moveList[index]; - } + ExtMove getMove(int index) { return moveList[index]; } static void create(); static void shuffle(); diff --git a/src/perfect/perfect_adaptor.cpp b/src/perfect/perfect_adaptor.cpp index 212e810a89..833a3caf07 100644 --- a/src/perfect/perfect_adaptor.cpp +++ b/src/perfect/perfect_adaptor.cpp @@ -135,9 +135,9 @@ int to_perfect_sq(Square sq) { constexpr int map[] = { -1, -1, -1, -1, -1, -1, -1, -1, - 18, 19, 20, 21, 22, 23, 16, 17, /* 8 - 15 */ - 10, 11, 12, 13, 14, 15, 8, 9, /* 16 - 23 */ - 2, 3, 4, 5, 6, 7, 0, 1, /* 24 - 31 */ + 18, 19, 20, 21, 22, 23, 16, 17, /* 8 - 15 */ + 10, 11, 12, 13, 14, 15, 8, 9, /* 16 - 23 */ + 2, 3, 4, 5, 6, 7, 0, 1, /* 24 - 31 */ -1, -1, -1, -1, -1, -1, -1, -1, }; @@ -303,7 +303,8 @@ Value perfect_search(const Position *pos, Move &move) try { int moveBitboard = GetBestMove(whiteBitboard, blackBitboard, whiteStonesToPlace, blackStonesToPlace, - playerToMove, onlyStoneTaking, value, move); + playerToMove, onlyStoneTaking, value, + move); moves = convertBitboardMove(whiteBitboard, blackBitboard, playerToMove, moveBitboard); diff --git a/src/perfect/perfect_api.h b/src/perfect/perfect_api.h index 8f1370d404..b13659e375 100644 --- a/src/perfect/perfect_api.h +++ b/src/perfect/perfect_api.h @@ -33,8 +33,8 @@ class MalomSolutionAccess public: static int getBestMove(int whiteBitboard, int blackBitboard, int whiteStonesToPlace, int blackStonesToPlace, - int playerToMove, bool onlyStoneTaking, - Value &value, const Move &refMove); + int playerToMove, bool onlyStoneTaking, Value &value, + const Move &refMove); static int getBestMoveNoException(int whiteBitboard, int blackBitboard, int whiteStonesToPlace, diff --git a/src/perfect/perfect_player.h b/src/perfect/perfect_player.h index 03420f7c12..b6f6284f14 100644 --- a/src/perfect/perfect_player.h +++ b/src/perfect/perfect_player.h @@ -190,8 +190,8 @@ class PerfectPlayer : public Player auto m = refMove; const Square from = from_sq(m); const Square to = to_sq(m); - - auto it = l.end(); + + auto it = l.end(); if (refMove == MOVE_NONE) { goto out; @@ -206,7 +206,7 @@ class PerfectPlayer : public Player advMoveRef.to = to_perfect_sq(to); } - it = std::find_if(l.begin(), l.end(), + it = std::find_if(l.begin(), l.end(), [&advMoveRef, m](const auto &elem) { if (m < 0) { return advMoveRef.takeHon == elem.takeHon; @@ -225,9 +225,10 @@ class PerfectPlayer : public Player return *it; } - out: +out: if (gameOptions.getShufflingEnabled()) { - std::uniform_int_distribution<> dis(0, static_cast(l.size() - 1)); + std::uniform_int_distribution<> dis(0, + static_cast(l.size() - 1)); return l[dis(gen)]; } diff --git a/src/perfect/perfect_test.cpp b/src/perfect/perfect_test.cpp index 82340ebd07..92bf548071 100644 --- a/src/perfect/perfect_test.cpp +++ b/src/perfect/perfect_test.cpp @@ -43,10 +43,10 @@ int perfect_test(int argc, char *argv[]) } // int res = MalomSolutionAccess::getBestMove(0, 0, 9, 9, 0, false, move); - int res = MalomSolutionAccess::getBestMove(1, 2, 8, 8, 0, false, - value, move); // Correct - // output: - // 16384 + int res = MalomSolutionAccess::getBestMove(1, 2, 8, 8, 0, false, value, + move); // Correct + // output: + // 16384 // int res = MalomSolutionAccess::getBestMove(1 + 2 + 4, 8 + 16 + 32, 100, // 0, 0, false, value, move); // tests exception // int res = MalomSolutionAccess::getBestMove(1 + 2 + 4, 1 + 8 + 16 + 32, diff --git a/src/thread.cpp b/src/thread.cpp index d5320d76ff..bf86a8025a 100644 --- a/src/thread.cpp +++ b/src/thread.cpp @@ -202,8 +202,7 @@ void Thread::emitCommand() bestvalue = -bestvalue; } - switch (aiMoveType) - { + switch (aiMoveType) { case AiMoveType::traditional: aiMoveTypeStr = ""; break; diff --git a/src/ui/flutter_app/lib/game_page/services/engine/engine.dart b/src/ui/flutter_app/lib/game_page/services/engine/engine.dart index 601774fdfc..49df5b5a6b 100644 --- a/src/ui/flutter_app/lib/game_page/services/engine/engine.dart +++ b/src/ui/flutter_app/lib/game_page/services/engine/engine.dart @@ -129,7 +129,8 @@ class Engine { logger.v("$_logTag response: $response"); if (response.contains("bestmove")) { - final RegExp regex = RegExp(r"info score (-?\d+)(?: aimovetype (\w+))? bestmove (.*)"); + final RegExp regex = + RegExp(r"info score (-?\d+)(?: aimovetype (\w+))? bestmove (.*)"); final Match? match = regex.firstMatch(response); String value = ""; String aiMoveTypeStr = ""; @@ -359,7 +360,7 @@ enum GameMode { testViaLAN, } -Map aiMoveTypeIcons = { +Map aiMoveTypeIcons = { AiMoveType.traditional: FluentIcons.bot_24_filled, AiMoveType.perfect: FluentIcons.database_24_filled, AiMoveType.consensus: FluentIcons.bot_add_24_filled, @@ -368,7 +369,8 @@ Map aiMoveTypeIcons = { extension GameModeExtension on GameMode { IconData get leftHeaderIcon { - final IconData botIcon = aiMoveTypeIcons[GameController().aiMoveType] ?? FluentIcons.bot_24_filled; + final IconData botIcon = aiMoveTypeIcons[GameController().aiMoveType] ?? + FluentIcons.bot_24_filled; switch (this) { case GameMode.humanVsAi: @@ -397,7 +399,8 @@ extension GameModeExtension on GameMode { } IconData get rightHeaderIcon { - final IconData botIcon = aiMoveTypeIcons[GameController().aiMoveType] ?? FluentIcons.bot_24_filled; + final IconData botIcon = aiMoveTypeIcons[GameController().aiMoveType] ?? + FluentIcons.bot_24_filled; switch (this) { case GameMode.humanVsAi: diff --git a/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart b/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart index 7867e7cfae..f7893f4107 100644 --- a/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart +++ b/src/ui/flutter_app/lib/general_settings/widgets/general_settings_page.dart @@ -104,8 +104,7 @@ class GeneralSettingsPage extends StatelessWidget { break; // TODO: Add whatIsRandom case SearchAlgorithm.random: - rootScaffoldMessengerKey.currentState! - .showSnackBarClear("Random"); + rootScaffoldMessengerKey.currentState!.showSnackBarClear("Random"); break; case null: break; diff --git a/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart b/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart index 2698fa8ea9..e31f05f6cb 100644 --- a/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart +++ b/src/ui/flutter_app/lib/rule_settings/widgets/rule_settings_page.dart @@ -52,8 +52,7 @@ class RuleSettingsPage extends StatelessWidget { logger.v("[config] piecesCount = $piecesCount"); - if (DB().generalSettings.usePerfectDatabase && - piecesCount != 9) { + if (DB().generalSettings.usePerfectDatabase && piecesCount != 9) { rootScaffoldMessengerKey.currentState! .showSnackBarClear(S.of(context).reopenToTakeEffect); }