Skip to content

Commit 71bf183

Browse files
Corvincerht
authored andcommitted
Always use relative imports and fix examples
1 parent 6780059 commit 71bf183

File tree

8 files changed

+12
-10
lines changed

8 files changed

+12
-10
lines changed

examples/bank_reserves/bank_reserves/agents.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"""
1212

1313
import mesa
14-
from bank_reserves.random_walk import RandomWalker
14+
from .random_walk import RandomWalker
1515

1616

1717
class Bank(mesa.Agent):

examples/bank_reserves/bank_reserves/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import mesa
1414
import numpy as np
15-
from bank_reserves.agents import Bank, Person
15+
from .agents import Bank, Person
1616

1717
"""
1818
If you want to perform a parameter sweep, call batch_run.py instead of run.py.

examples/bank_reserves/bank_reserves/server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import mesa
2-
from bank_reserves.agents import Person
3-
from bank_reserves.model import BankReserves
2+
from .agents import Person
3+
from .model import BankReserves
44

55
"""
66
Citation:

examples/charts/charts/agents.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"""
1212

1313
import mesa
14-
from charts.random_walk import RandomWalker
14+
from .random_walk import RandomWalker
1515

1616

1717
class Bank(mesa.Agent):

examples/charts/charts/model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import mesa
1414
import numpy as np
15-
from charts.agents import Bank, Person
15+
from .agents import Bank, Person
1616

1717
"""
1818
If you want to perform a parameter sweep, call batch_run.py instead of run.py.

examples/hex_snowflake/hex_snowflake/model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import mesa
2-
from hex_snowflake.cell import Cell
2+
from .cell import Cell
33

44

55
class HexSnowflake(mesa.Model):
@@ -22,7 +22,7 @@ def __init__(self, width=50, height=50):
2222
self.schedule = mesa.time.SimultaneousActivation(self)
2323

2424
# Use a hexagonal grid, where edges wrap around.
25-
self.grid = mesa.space.HexGrid(width, height, torus=True)
25+
self.grid = mesa.space.HexSingleGrid(width, height, torus=True)
2626

2727
# Place a dead cell at each location.
2828
for contents, pos in self.grid.coord_iter():

examples/sugarscape_cg/sugarscape_cg/model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"""
1111

1212
import mesa
13+
from pathlib import Path
1314

1415
from .agents import SsAgent, Sugar
1516

@@ -43,7 +44,7 @@ def __init__(self, width=50, height=50, initial_population=100):
4344
# Create sugar
4445
import numpy as np
4546

46-
sugar_distribution = np.genfromtxt("sugarscape_cg/sugar-map.txt")
47+
sugar_distribution = np.genfromtxt(Path(__file__).parent / "sugar-map.txt")
4748
agent_id = 0
4849
for _, (x, y) in self.grid.coord_iter():
4950
max_sugar = sugar_distribution[x, y]

examples/sugarscape_g1mt/sugarscape_g1mt/model.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from pathlib import Path
12
import mesa
23
import numpy as np
34

@@ -87,7 +88,7 @@ def __init__(
8788
)
8889

8990
# read in landscape file from supplmentary material
90-
sugar_distribution = np.genfromtxt("sugarscape_g1mt/sugar-map.txt")
91+
sugar_distribution = np.genfromtxt(Path(__file__).parent / "sugar-map.txt")
9192
spice_distribution = np.flip(sugar_distribution, 1)
9293

9394
agent_id = 0

0 commit comments

Comments
 (0)