Skip to content

sugarscape_g1mt: Remove dependence on model.schedule.steps #95

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

Merged
Corvince merged 1 commit into from
Jan 27, 2024
Merged

sugarscape_g1mt: Remove dependence on model.schedule.steps #95

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 4 additions & 9 deletions examples/sugarscape_g1mt/sugarscape_g1mt/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,7 @@ def step(self):

if not self.enable_trade:
# If trade is not enabled, return early
self.schedule.steps += (
1 # important for data collector to track number of steps
)
self._steps += 1
self.datacollector.collect(self)
return

Expand All @@ -182,10 +180,7 @@ def step(self):
for agent in trader_shuffle:
agent.trade_with_neighbors()

self.schedule.steps += (
1 # important for data collector to track number of steps
)

self._steps += 1
# collect model level data
self.datacollector.collect(self)
"""
Expand All @@ -201,11 +196,11 @@ def step(self):
"""
# Need to remove excess data
# Create local variable to store trade data
agent_trades = self.datacollector._agent_records[self.schedule.steps]
agent_trades = self.datacollector._agent_records[self._steps]
# Get rid of all None to reduce data storage needs
agent_trades = [agent for agent in agent_trades if agent[2] is not None]
# Reassign the dictionary value with lean trade data
self.datacollector._agent_records[self.schedule.steps] = agent_trades
self.datacollector._agent_records[self._steps] = agent_trades

def run_model(self, step_count=1000):
for i in range(step_count):
Expand Down