infoのscoreサブコマンドやinfoコマンド自体の入力が無いときに、InfoListenerがKeyErrorを吐かないようにした #52
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… commands are missing Refactored the regular expression and parsing logic in the InfoListener class to improve readability and maintainability. The updated regex now focuses on the 'pv' (Principal Variation) information directly, simplifying the extraction of other details as needed. This change also includes a more robust error handling for parsing integer values and handles cases where the best move is not present in the info dictionary, returning None instead of raising an exception. Additionally, the score calculation has been adjusted to correctly interpret the 'mate' keyword and return the appropriate mate score.
| info_dict['string'] = m[1][7:] | ||
| break | ||
| elif name == 'score': | ||
| name = items.pop(0) |
|
大丈夫です。name（サブコマンド名）が"score"の場合のみ、（サブ・サブコマンド名の）"cp"か"mate"に上書きされます。挙動は元のコードと同じです。
元のテキストが "info score cp 60 pv 3c3d" ならば、出力は {"score": "cp", "cp": 60, "pv":
"3c3d"} のようになります。
…On Wed, Jun 12, 2024 at 9:12 PM TadaoYamaoka ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In cshogi/usi/Engine.py
<#52 (comment)>:
> - info_dict['score'] = 'mate'
- if m[3] == '+' or m[3] == '-':
- info_dict['mate'] = m[3]
- else:
- info_dict['mate'] = int(m[3])
- info_dict['pv'] = (m[5] + m[6]).split(' ')
+ while items:
+ name = items.pop(0)
+ if name == 'pv':
+ info_dict['pv'] = items
+ break
+ elif name == 'string':
+ info_dict['string'] = m[1][7:]
+ break
+ elif name == 'score':
+ name = items.pop(0)
nameを上書きして大丈夫でしょうか？
—
Reply to this email directly, view it on GitHub
<#52 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ABXQRXSODDPOIM3MGGT5323ZHA3L3AVCNFSM6AAAAABJF4YLP6VHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDCMJSHAZTONRSGA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
TadaoYamaoka
added a commit
that referenced
this pull request
Jul 11, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
短い思考時間の場合、思考エンジンがinfoコマンドのscoreサブコマンドや、infoコマンド自体を出力しない場合があります。そのような場合に、InfoListenerやMultiPVListenerのscoreやinfoメソッドがKeyErrorを吐いて止まってしまわないように、infoのパース方法を変更したり、出力の存在をチェックをしたりするように変更しました。