moved all boltman models over

Author: quaquel

examples/aco_tsp/aco_tsp/model.py

@@ -3,8 +3,6 @@
 import mesa
 import networkx as nx
 import numpy as np
-
-
 from mesa.spaces import CellAgent, Network
 
 

examples/bank_reserves/bank_reserves/model.py

@@ -12,9 +12,9 @@
 
 import mesa
 import numpy as np
+from mesa.spaces import OrthogonalMooreGrid
 
 from .agents import Bank, Person
-from mesa.spaces import OrthogonalMooreGrid
 
 """
 If you want to perform a parameter sweep, call batch_run.py instead of run.py.

examples/bank_reserves/bank_reserves/server.py

@@ -83,7 +83,7 @@ def person_portrayal(agent):
 
 # create instance of Mesa ModularServer
 server = mesa.visualization.ModularServer(
-    BankReserves,
+    BankReservesModel,
     [canvas_element, chart_element],
     "Bank Reserves Model",
     model_params=model_params,

examples/bank_reserves/batch_run.py

@@ -24,12 +24,9 @@
 every step of every run.
 """
 
-import itertools
 
 import mesa
-import numpy as np
 import pandas as pd
-
 from bank_reserves.model import BankReservesModel
 
 

examples/boltzmann_wealth_model/boltzmann_wealth_model/model.py

@@ -20,19 +20,19 @@ class BoltzmannWealthModel(mesa.Model):
     def __init__(self, N=100, width=10, height=10):
         super().__init__()
         self.num_agents = N
-        self.grid = mesa.space.MultiGrid(width, height, True)
+        self.grid = mesa.spaces.OrthogonalMooreGrid((width, height), torus=True, random=self.random)
 
         self.datacollector = mesa.DataCollector(
             model_reporters={"Gini": compute_gini}, agent_reporters={"Wealth": "wealth"}
         )
         # Create agents
         for _ in range(self.num_agents):
-            a = MoneyAgent(self)
+            agent = MoneyAgent(self)
 
             # Add the agent to a random grid cell
-            x = self.random.randrange(self.grid.width)
-            y = self.random.randrange(self.grid.height)
-            self.grid.place_agent(a, (x, y))
+            x = self.random.randrange(width)
+            y = self.random.randrange(height)
+            agent.move_to(self.grid[(x,y)])
 
         self.running = True
         self.datacollector.collect(self)
@@ -47,31 +47,21 @@ def run_model(self, n):
             self.step()
 
 
-class MoneyAgent(mesa.Agent):
+class MoneyAgent(mesa.spaces.CellAgent):
     """An agent with fixed initial wealth."""
 
     def __init__(self, model):
         super().__init__(model)
         self.wealth = 1
 
-    def move(self):
-        possible_steps = self.model.grid.get_neighborhood(
-            self.pos, moore=True, include_center=False
-        )
-        new_position = self.random.choice(possible_steps)
-        self.model.grid.move_agent(self, new_position)
-
     def give_money(self):
-        cellmates = self.model.grid.get_cell_list_contents([self.pos])
-        cellmates.pop(
-            cellmates.index(self)
-        )  # Ensure agent is not giving money to itself
+        cellmates = [agent for agent in self.cell.agents if agent is not self]  # Ensure agent is not giving money to itself
         if len(cellmates) > 0:
             other = self.random.choice(cellmates)
             other.wealth += 1
             self.wealth -= 1
 
     def step(self):
-        self.move()
+        self.move_to(self.cell.neighborhood().select_random_cell())
         if self.wealth > 0:
             self.give_money()

examples/boltzmann_wealth_model_experimental/model.py

@@ -20,19 +20,19 @@ class BoltzmannWealthModel(mesa.Model):
     def __init__(self, N=100, width=10, height=10):
         super().__init__()
         self.num_agents = N
-        self.grid = mesa.space.MultiGrid(width, height, True)
+        self.grid = mesa.spaces.OrthogonalMooreGrid((width, height), torus=True, random=self.random)
 
         self.datacollector = mesa.DataCollector(
             model_reporters={"Gini": compute_gini}, agent_reporters={"Wealth": "wealth"}
         )
         # Create agents
         for _ in range(self.num_agents):
-            a = MoneyAgent(self)
+            agent = MoneyAgent(self)
 
             # Add the agent to a random grid cell
-            x = self.random.randrange(self.grid.width)
-            y = self.random.randrange(self.grid.height)
-            self.grid.place_agent(a, (x, y))
+            x = self.random.randrange(width)
+            y = self.random.randrange(height)
+            agent.move_to(self.grid[(x, y)])
 
         self.running = True
         self.datacollector.collect(self)
@@ -47,31 +47,21 @@ def run_model(self, n):
             self.step()
 
 
-class MoneyAgent(mesa.Agent):
+class MoneyAgent(mesa.spaces.CellAgent):
     """An agent with fixed initial wealth."""
 
     def __init__(self, model):
         super().__init__(model)
         self.wealth = 1
 
-    def move(self):
-        possible_steps = self.model.grid.get_neighborhood(
-            self.pos, moore=True, include_center=False
-        )
-        new_position = self.random.choice(possible_steps)
-        self.model.grid.move_agent(self, new_position)
-
     def give_money(self):
-        cellmates = self.model.grid.get_cell_list_contents([self.pos])
-        cellmates.pop(
-            cellmates.index(self)
-        )  # Ensure agent is not giving money to itself
+        cellmates = [agent for agent in self.cell.agents if agent is not self]
         if len(cellmates) > 0:
             other = self.random.choice(cellmates)
             other.wealth += 1
             self.wealth -= 1
 
     def step(self):
-        self.move()
+        self.move_to(self.cell.neighborhood().select_random_cell())
         if self.wealth > 0:
             self.give_money()

examples/boltzmann_wealth_model_network/boltzmann_wealth_model_network/model.py

@@ -18,7 +18,8 @@ def __init__(self, num_agents=7, num_nodes=10):
         self.num_agents = num_agents
         self.num_nodes = num_nodes if num_nodes >= self.num_agents else self.num_agents
         self.G = nx.erdos_renyi_graph(n=self.num_nodes, p=0.5)
-        self.grid = mesa.space.NetworkGrid(self.G)
+        self.grid = mesa.spaces.Network(self.G, random=self.random, capacity=1)
+
 
         self.datacollector = mesa.DataCollector(
             model_reporters={"Gini": compute_gini},
@@ -28,11 +29,11 @@ def __init__(self, num_agents=7, num_nodes=10):
         list_of_random_nodes = self.random.sample(list(self.G), self.num_agents)
 
         # Create agents
-        for i in range(self.num_agents):
-            a = MoneyAgent(self)
+        for position in list_of_random_nodes:
+            agent = MoneyAgent(self)
 
             # Add the agent to a random node
-            self.grid.place_agent(a, list_of_random_nodes[i])
+            agent.move_to(self.grid[position])
 
         self.running = True
         self.datacollector.collect(self)
@@ -47,31 +48,25 @@ def run_model(self, n):
             self.step()
 
 
-class MoneyAgent(mesa.Agent):
+class MoneyAgent(mesa.spaces.CellAgent):
     """An agent with fixed initial wealth."""
 
     def __init__(self, model):
         super().__init__(model)
         self.wealth = 1
 
-    def move(self):
-        possible_steps = [
-            node
-            for node in self.model.grid.get_neighborhood(self.pos, include_center=False)
-            if self.model.grid.is_cell_empty(node)
-        ]
-        if len(possible_steps) > 0:
-            new_position = self.random.choice(possible_steps)
-            self.model.grid.move_agent(self, new_position)
 
     def give_money(self):
-        neighbors = self.model.grid.get_neighbors(self.pos, include_center=False)
+        neighbors = [agent for agent in self.cell.neighborhood().agents if not self]
         if len(neighbors) > 0:
             other = self.random.choice(neighbors)
             other.wealth += 1
             self.wealth -= 1
 
     def step(self):
-        self.move()
+        empty_neighbors = [cell for cell in self.cell.neighborhood() if cell.is_empty]
+        if empty_neighbors:
+            self.move_to(self.random.choice(empty_neighbors))
+
         if self.wealth > 0:
             self.give_money()