Skip to content

rename 'flockers' to 'boid-flockers' #518

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
merged 3 commits into from
May 14, 2018
Merged

rename 'flockers' to 'boid-flockers' #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a7f5250
rename 'flockers' to 'boid-flockers'
djmitche May 14, 2018
43d2285
fix minor flake8 issues
djmitche May 14, 2018
011269c
Merge branch 'flakefix' into rename-flockers
djmitche May 14, 2018
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
0 examples/flockers/Flocker Test.ipynb → examples/boid-flockers/Flocker Test.ipynb
View file
Open in desktop
File renamed without changes.
0 examples/flockers/Readme.md → examples/boid-flockers/Readme.md
View file
Open in desktop
File renamed without changes.
0 ...ockers/flockers/SimpleContinuousModule.py → ...rs/boidflockers/SimpleContinuousModule.py
View file
Open in desktop
File renamed without changes.
0 examples/flockers/flockers/boid.py → examples/boid-flockers/boidflockers/boid.py
View file
Open in desktop
File renamed without changes.
0 examples/flockers/flockers/model.py → examples/boid-flockers/boidflockers/model.py
View file
Open in desktop
File renamed without changes.
0 examples/flockers/flockers/server.py → ...ples/boid-flockers/boidflockers/server.py
View file
Open in desktop
File renamed without changes.
0 ...kers/flockers/simple_continuous_canvas.js → .../boidflockers/simple_continuous_canvas.js
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions examples/boid-flockers/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from boidflockers.server import server

server.launch()
3 changes: 0 additions & 3 deletions examples/flockers/run.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions mesa/batchrunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ def _process_parameters(self, params):
def run_all(self):
""" Run the model at all parameter combinations and store results. """
param_names, param_ranges = zip(*self.variable_parameters.items())
run_count = count()
total_iterations = self.iterations
for param_range in param_ranges:
total_iterations *= len(param_range)
Expand All @@ -138,7 +137,6 @@ def run_all(self):
self.agent_vars[agent_key] = reports
pbar.update()


def _run_single_model(self, param_values, run_count, kwargs):
"""
Run a single model for one parameter combination and one iteration,
Expand All @@ -161,7 +159,6 @@ def _run_single_model(self, param_values, run_count, kwargs):

return (getattr(self, "model_vars", None), getattr(self, "agent_vars", None))


def run_model(self, model):
""" Run a model object to completion, or until reaching max steps.

Expand Down