diff --git a/katrain/config.json b/katrain/config.json index e643f7e..d2c517b 100644 --- a/katrain/config.json +++ b/katrain/config.json @@ -69,8 +69,8 @@ ], "low_visits": 25, "eval_off_show_last": 3, - "top_moves_show": "delta_score", - "top_moves_show_secondary": "visits", + "top_moves_show": "top_move_delta_score", + "top_moves_show_secondary": "top_move_visits", "eval_show_ai": true, "lock_ai": false }, diff --git a/katrain/core/constants.py b/katrain/core/constants.py index c201e00..6ebb1f8 100644 --- a/katrain/core/constants.py +++ b/katrain/core/constants.py @@ -222,12 +222,12 @@ AI_PICK_ELO_GRID = [ ] -TOP_MOVE_DELTA_SCORE = "delta score" -TOP_MOVE_SCORE = "score" -TOP_MOVE_DELTA_WINRATE = "delta winrate" -TOP_MOVE_WINRATE = "winrate" -TOP_MOVE_VISITS = "visits" -TOP_MOVE_NOTHING = "" +TOP_MOVE_DELTA_SCORE = "top_move_delta_score" +TOP_MOVE_SCORE = "top_move_score" +TOP_MOVE_DELTA_WINRATE = "top_move_delta_winrate" +TOP_MOVE_WINRATE = "top_move_winrate" +TOP_MOVE_VISITS = "top_move_visits" +TOP_MOVE_NOTHING = "top_move_nothing" TOP_MOVE_OPTIONS = [ TOP_MOVE_DELTA_SCORE, diff --git a/katrain/gui/badukpan.py b/katrain/gui/badukpan.py index 592fa7c..24a6110 100644 --- a/katrain/gui/badukpan.py +++ b/katrain/gui/badukpan.py @@ -476,9 +476,7 @@ class BadukPanWidget(Widget): if move_dict["visits"] < low_visits_threshold and not engine_best_move: scale = UNCERTAIN_HINT_SCALE text_on = False - alpha = HINTS_MIN_ALPHA + (HINTS_ALPHA - HINTS_MIN_ALPHA) * ( - move_dict["visits"] / low_visits_threshold - ) + alpha = HINTS_LO_ALPHA if "pv" in move_dict: self.active_pv_moves.append((move.coords, move_dict["pv"], current_node)) else: diff --git a/katrain/gui/style.py b/katrain/gui/style.py index 2065e8f..c38edcf 100644 --- a/katrain/gui/style.py +++ b/katrain/gui/style.py @@ -63,7 +63,7 @@ STARPOINT_SIZE = 0.1 BOARD_COLOR = [0.85, 0.68, 0.40, 1] STONE_SIZE = 0.505 # texture edge is transparent -HINTS_MIN_ALPHA = 0.2 # single visit +HINTS_LO_ALPHA = 0.6 HINTS_ALPHA = 0.8 POLICY_ALPHA = 0.6 TOP_POLICY_ALPHA = 0.3 diff --git a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo index e98a995..3b3df3c 100644 Binary files a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po index d1a2f98..4858a0e 100644 --- a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po @@ -613,9 +613,6 @@ msgstr "覆盖引擎命令" msgid "download katago button" msgstr "下载KataGo 版本" -msgid "show point loss as text" -msgstr "在棋子上显示目数损失" - msgid "katago binaries available" msgstr "{num} 个exe文件可用" @@ -690,3 +687,35 @@ msgstr "" #. TODO - DEPRECATED msgid "ai:settle" msgstr "Settle Style" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo index 0d41741..de4c5ea 100644 Binary files a/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po index 470375b..0831153 100644 --- a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po @@ -668,9 +668,6 @@ msgstr "" "in der KataGo-Dokumentation oder versuch, KataGo alleine zu starten, um " "Einzelheiten zu erfahren." -msgid "show point loss as text" -msgstr "Zeig den Punkteverlust auf Beste Züge" - msgid "teaching undo message" msgstr "" "Zug {move} zurückgenommen, da er {points_lost:.1f} Punkte verliert. Bitte " @@ -704,8 +701,8 @@ msgid "aihelp:simple" msgstr "" "Spielt Züge, die dazu zu einer Vereinfachung des Brettzustandes führen. Von " "Zügen,die höchstens 'max_points_lost' Punkte verlieren und mit wenigstens " -"'min_visits' Visits, bevorzuge die Züge, die weniger Punkte verlieren und" -"eigenes Gebiet mehr sichern." +"'min_visits' Visits, bevorzuge die Züge, die weniger Punkte verlieren " +"undeigenes Gebiet mehr sichern." msgid "ai:simple" msgstr "Einfacher Stil" @@ -735,3 +732,35 @@ msgstr "" msgid "Make Main Branch" msgstr "Zum Hauptzweig machen" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in Win Rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win Rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in Score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo index 246353d..f39a64c 100644 Binary files a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po index f743512..c7a9635 100644 --- a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po @@ -405,10 +405,6 @@ msgstr "" "Show dots/SGF comments\n" " for AI players" -#. in addition to colour, show point loss as -0.1 etc on hints/top moves -msgid "show point loss as text" -msgstr "Show point loss on top moves" - #. removed as an option / can ignore msgid "lock ai when playing" msgstr "" @@ -763,3 +759,35 @@ msgstr "Default Theme" #. theme name msgid "theme:red-green-colourblind" msgstr "Red-Green Colourblind" + +#. setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo index e1efb06..987409a 100644 Binary files a/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po index 63d6036..743f1bc 100644 --- a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po @@ -681,11 +681,6 @@ msgstr "" "Failed to start KataGo due to missing DLL. Check the requirements, or try " "running the binary by itself for details. " -#. TODO - in addition to colour, show point loss as -0.1 etc on hints/top -#. moves -msgid "show point loss as text" -msgstr "Show point loss on top moves" - #. TODO - resign the game msgid "resign" msgstr "Resign" @@ -752,3 +747,35 @@ msgstr "" #. TODO - on move tree editing msgid "Make Main Branch" msgstr "Make Main Branch" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo index 187adca..1bc6cb7 100644 Binary files a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po index e039b95..d8ef02f 100644 --- a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po @@ -711,9 +711,6 @@ msgstr "" "votre configuration système, ou bien essayez l'exécutable seul pour plus de " "détails." -msgid "show point loss as text" -msgstr "Indiquer les points perdus" - msgid "resign" msgstr "Abandon" @@ -776,3 +773,35 @@ msgstr "" msgid "Make Main Branch" msgstr "Mettre en branche principale" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo index 1667cd0..c947078 100644 Binary files a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po index bc6154c..ae45341 100644 --- a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po @@ -658,11 +658,6 @@ msgstr "" "KataGoの起動に失敗しました. DLLがみつかりません. 必要なものをKataGoの説明書で確認するか, " "KataGo実行ファイル自体を直接実行して詳細を調べてください." -#. in addition to colour, show point loss as -0.1 etc on hints/top -#. moves -msgid "show point loss as text" -msgstr "損失目数を候補手上に表示" - #. resign the game msgid "resign" msgstr "投了" @@ -731,3 +726,35 @@ msgstr "" #. on move tree editing msgid "Make Main Branch" msgstr "こちらを主分岐に" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "Nothing" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo index d2aadef..4d90b03 100644 Binary files a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po index 30e1461..3632933 100644 --- a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po @@ -638,9 +638,6 @@ msgid "Engine missing DLL" msgstr "" "없는 DLL 파일이 있어 KataGo가 실행되지 않습니다. 요구사항을 점검하시거나, 실행 파일을 따로 실행해 세부사항을 알아보십시오." -msgid "show point loss as text" -msgstr "돌 위에 집 손해 표시하기" - msgid "resign" msgstr "기권" @@ -704,3 +701,35 @@ msgstr "" msgid "Make Main Branch" msgstr "주 변화로 만들기" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "---" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo index 0340107..2cc0113 100644 Binary files a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo differ diff --git a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po index 2f68fa8..f159001 100644 --- a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po +++ b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po @@ -673,9 +673,6 @@ msgstr "" "Не удалось запустить KataGo из-за отсутствующих DLL. Проверьте требования " "или запустите бинарный файл сам по себе для получения подробностей." -msgid "show point loss as text" -msgstr "Показывать потерянные очки текстом" - msgid "resign" msgstr "Сдаться" @@ -738,3 +735,35 @@ msgstr "" msgid "Make Main Branch" msgstr "Сделать главной веткой" + +#. TODO - setting: what to show on top move (e.g. point loss, visits, ...) +msgid "stats on top move" +msgstr "Stats on top moves" + +#. TODO - Dropdown menu option +msgid "top_move_delta_winrate" +msgstr "Change in win rate" + +#. TODO - Dropdown menu option +msgid "top_move_visits" +msgstr "Visits" + +#. TODO - Dropdown menu option +msgid "top_move_score" +msgstr "Score" + +#. TODO - Dropdown menu option +msgid "top_move_nothing" +msgstr "-" + +#. TODO - Dropdown menu option +msgid "top_move_winrate" +msgstr "Win rate" + +#. TODO - Dropdown menu option +msgid "top_move_delta_score" +msgstr "Change in score" + +#. TODO - top move stats show threshold description +msgid "show stats if" +msgstr "Show stats if more than ... visits" diff --git a/katrain/popups.kv b/katrain/popups.kv index de1f919..eca98e4 100644 --- a/katrain/popups.kv +++ b/katrain/popups.kv @@ -285,7 +285,7 @@ cols: 2 rows: 4 padding: 4 - size_hint: 0.9, 1 + size_hint: 0.95, 1 DescriptionLabel: font_size: DESC_FONT_SIZE * 0.8 text: i18n._("theme") @@ -297,15 +297,16 @@ id: themes_spinner DescriptionLabel: font_size: DESC_FONT_SIZE * 0.8 - text: i18n._("analysis:topmoves").replace('\n',' ') + text: i18n._("stats on top move") BoxLayout: orientation: 'horizontal' + size_hint: 1.5,1 LabelledSpinner: id: top_moves_show value_refs: TOP_MOVE_OPTIONS input_property: "trainer/top_moves_show" Label: - size_hint: 0.15, 1 + size_hint: 0.1, 1 text: '&' LabelledSpinner: id: top_moves_show_secondary @@ -313,7 +314,7 @@ input_property: "trainer/top_moves_show_secondary" DescriptionLabel: font_size: DESC_FONT_SIZE * 0.8 - text: i18n._("show point loss as text") + text: i18n._("show stats if") BoxLayout: Label: text: '>'