Skip to content

Commit cf38477

Browse files
committed
Revert "fix: Use new API to loop over agents_by_type"
This reverts commit ef2b5e7.
1 parent b547ee3 commit cf38477

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

examples/sugarscape_g1mt/sugarscape_g1mt/model.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,13 @@ def __init__(
7777
model_reporters={
7878
"Trader": lambda m: m.schedule.get_type_count(Trader),
7979
"Trade Volume": lambda m: sum(
80-
len(a.trade_partners) for a in m.schedule.agents_by_type[Trader]
80+
len(a.trade_partners)
81+
for a in m.schedule.agents_by_type[Trader].values()
8182
),
8283
"Price": lambda m: geometric_mean(
83-
flatten([a.prices for a in m.schedule.agents_by_type[Trader]])
84+
flatten(
85+
[a.prices for a in m.schedule.agents_by_type[Trader].values()]
86+
)
8487
),
8588
},
8689
agent_reporters={"Trade Network": lambda a: get_trade(a)},
@@ -140,7 +143,7 @@ def randomize_traders(self):
140143
puts traders in randomized list for step function
141144
"""
142145

143-
traders_shuffle = list(self.schedule.agents_by_type[Trader])
146+
traders_shuffle = list(self.schedule.agents_by_type[Trader].values())
144147
self.random.shuffle(traders_shuffle)
145148

146149
return traders_shuffle
@@ -151,7 +154,7 @@ def step(self):
151154
and then randomly activates traders
152155
"""
153156
# step Resource agents
154-
for resource in self.schedule.agents_by_type[Resource]:
157+
for resource in self.schedule.agents_by_type[Resource].values():
155158
resource.step()
156159

157160
# step trader agents

examples/wolf_sheep/wolf_sheep/scheduler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def get_type_count(
2525
if type_class not in self.agents_by_type:
2626
return 0
2727
count = 0
28-
for agent in self.agents_by_type[type_class]:
28+
for agent in self.agents_by_type[type_class].values():
2929
if filter_func is None or filter_func(agent):
3030
count += 1
3131
return count

0 commit comments

Comments
 (0)