Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge in daide2eng #14

Merged
merged 10 commits into from
Nov 5, 2024
Merged

Merge in daide2eng #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
466904d
Copy code from `daide2eng`
aphedges Nov 1, 2024
c7141df
Remove incompatibilities with `daidepp`
aphedges Nov 1, 2024
3d07c43
Fix `black` errors
aphedges Nov 1, 2024
b9e4a13
Fix many `ruff` errors automatically
aphedges Nov 1, 2024
ac092bc
Make DAIDE-to-English translation actually work
aphedges Nov 5, 2024
5a48d6c
Fix typos detected by `codespell`
aphedges Nov 5, 2024
0f658b7
Fix remaining `ruff` errors
aphedges Nov 5, 2024
30627de
Fix failing `mypy` checks
aphedges Nov 5, 2024
7053144
Allow DAIDE objects as input to `gen_english()`
aphedges Nov 5, 2024
3a5f6ce
Generate English proposals in `RandomProposerBot`
aphedges Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/chiron_utils/bots/random_proposer_bot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from diplomacy.utils.constants import SuggestionType

from chiron_utils.bots.baseline_bot import BaselineBot, BotType
from chiron_utils.daide2eng import gen_english
from chiron_utils.parsing_utils import dipnet_to_daide_parsing
from chiron_utils.utils import get_other_powers

Expand Down Expand Up @@ -61,7 +62,7 @@ def get_random_proposal_orders(self) -> Dict[str, str]:
else:
suggested_random_orders = PRP(*random_orders)

proposals[other_power] = str(suggested_random_orders)
proposals[other_power] = gen_english(suggested_random_orders)

return proposals

Expand Down
Loading