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.

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

Moving examples to use the new discrete spaces #198

Merged
merged 35 commits into from
Oct 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
41b2dd1
moving acto_tsp
quaquel Sep 10, 2024
e775b42
Update model.py
quaquel Sep 10, 2024
1b629a6
move bank model to new OrthogonalMooreGrid
quaquel Sep 10, 2024
a1a15b3
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 10, 2024
bd0a4fa
fix random in atc
quaquel Sep 10, 2024
bab2de8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 10, 2024
a0d40a4
moved all boltman models over
quaquel Sep 13, 2024
9b89085
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 13, 2024
9b833f4
another batch of models
quaquel Sep 18, 2024
ef61c59
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Sep 18, 2024
281e9db
bring in line with main
quaquel Oct 7, 2024
ca2317f
figuring out build failure
quaquel Oct 7, 2024
e88d645
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
a94c325
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
7fd5774
2 more examples moved
quaquel Oct 7, 2024
4e99603
updated hotelling
quaquel Oct 7, 2024
28a348b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
878b51a
add seed kwarg
quaquel Oct 7, 2024
891a94c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
4c4bae1
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 7, 2024
9972fa8
remove unused variables
quaquel Oct 7, 2024
f457639
a few more examples are moved over
quaquel Oct 12, 2024
e2d1b7b
sugarscape
quaquel Oct 12, 2024
fa6cef8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
e2eff63
wolf-sheep
quaquel Oct 12, 2024
d57aa74
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
480cdb4
ruff related fixes
quaquel Oct 12, 2024
c433382
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
40399c7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
86f8592
rebase and some additional fixes
quaquel Oct 12, 2024
e5c69b6
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 12, 2024
95f862e
Merge remote-tracking branch 'upstream/main' into new_spaces
quaquel Oct 14, 2024
f9f7b84
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 14, 2024
acbff93
Fix pre-commit
EwoutH Oct 15, 2024
6b804bd
Revert basic example models to current grids
EwoutH Oct 15, 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
Prev Previous commit
Next Next commit
fix random in atc
quaquel committed Oct 12, 2024
commit bd0a4fa9e1d4b4bc557ff8ba8a7d913cbf0c9823
2 changes: 1 addition & 1 deletion examples/aco_tsp/aco_tsp/model.py
Original file line number Diff line number Diff line change
@@ -182,7 +182,7 @@ def __init__(
self.num_cities = tsp_graph.num_cities
self.all_cities = set(range(self.num_cities))
self.max_steps = max_steps
self.grid = Network(tsp_graph.g)
self.grid = Network(tsp_graph.g, random=self.random)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe call it space here, since it isn't really a grid?

Suggested change
self.grid = Network(tsp_graph.g, random=self.random)
self.space = Network(tsp_graph.g, random=self.random)


for _ in range(self.num_agents):
agent = AntTSP(model=self, alpha=ant_alpha, beta=ant_beta)