File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed
sugarscape_g1mt/sugarscape_g1mt Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -77,10 +77,13 @@ def __init__(
77
77
model_reporters = {
78
78
"Trader" : lambda m : m .schedule .get_type_count (Trader ),
79
79
"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 ()
81
82
),
82
83
"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
+ )
84
87
),
85
88
},
86
89
agent_reporters = {"Trade Network" : lambda a : get_trade (a )},
@@ -140,7 +143,7 @@ def randomize_traders(self):
140
143
puts traders in randomized list for step function
141
144
"""
142
145
143
- traders_shuffle = list (self .schedule .agents_by_type [Trader ])
146
+ traders_shuffle = list (self .schedule .agents_by_type [Trader ]. values () )
144
147
self .random .shuffle (traders_shuffle )
145
148
146
149
return traders_shuffle
@@ -151,7 +154,7 @@ def step(self):
151
154
and then randomly activates traders
152
155
"""
153
156
# step Resource agents
154
- for resource in self .schedule .agents_by_type [Resource ]:
157
+ for resource in self .schedule .agents_by_type [Resource ]. values () :
155
158
resource .step ()
156
159
157
160
# step trader agents
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ def get_type_count(
25
25
if type_class not in self .agents_by_type :
26
26
return 0
27
27
count = 0
28
- for agent in self .agents_by_type [type_class ]:
28
+ for agent in self .agents_by_type [type_class ]. values () :
29
29
if filter_func is None or filter_func (agent ):
30
30
count += 1
31
31
return count
You can’t perform that action at this time.
0 commit comments