ruff related fixes

Author: quaquel

examples/bank_reserves/bank_reserves/agents.py

@@ -65,29 +65,26 @@ def __init__(self, model, moore, bank, rich_threshold):
     def do_business(self):
         """check if person has any savings, any money in wallet, or if the
         bank can loan them any money"""
-        if self.savings > 0 or self.wallet > 0 or self.bank.bank_to_loan > 0:
+        if (self.savings > 0 or self.wallet > 0 or self.bank.bank_to_loan > 0) and len(self.cell.agents) > 1:
             # create list of people at my location (includes self)
-
-            # check if other people are at my location
-            if len(self.cell.agents) > 1:
-                # set customer to self for while loop condition
-                customer = self
-                while customer == self:
-                    customer = self.random.choice(self.cell.agents)
-                # 50% chance of trading with customer
+            # set customer to self for while loop condition
+            customer = self
+            while customer == self:
+                customer = self.random.choice(self.cell.agents)
+            # 50% chance of trading with customer
+            if self.random.randint(0, 1) == 0:
+                # 50% chance of trading $5
                 if self.random.randint(0, 1) == 0:
-                    # 50% chance of trading $5
-                    if self.random.randint(0, 1) == 0:
-                        # give customer $5 from my wallet
-                        # (may result in negative wallet)
-                        customer.wallet += 5
-                        self.wallet -= 5
-                    # 50% chance of trading $2
-                    else:
-                        # give customer $2 from my wallet
-                        # (may result in negative wallet)
-                        customer.wallet += 2
-                        self.wallet -= 2
+                    # give customer $5 from my wallet
+                    # (may result in negative wallet)
+                    customer.wallet += 5
+                    self.wallet -= 5
+                # 50% chance of trading $2
+                else:
+                    # give customer $2 from my wallet
+                    # (may result in negative wallet)
+                    customer.wallet += 2
+                    self.wallet -= 2
 
     def balance_books(self):
         # check if wallet is negative from trading with customer

examples/bank_reserves/batch_run.py

@@ -23,10 +23,19 @@
 directory from which Python was run. The CSV file will contain the data from
 every step of every run.
 """
-
+import itertools
 import mesa
 import pandas as pd
-from bank_reserves.model import BankReservesModel
+from bank_reserves.agents import Bank, Person
+from bank_reserves.model import (
+    get_num_mid_agents,
+    get_num_poor_agents,
+    get_num_rich_agents,
+    get_total_loans,
+    get_total_money,
+    get_total_savings,
+    get_total_wallets,
+)
 
 
 def track_params(model):
@@ -39,7 +48,6 @@ def track_run(model):
 
 class BankReservesModel(mesa.Model):
     # id generator to track run number in batch run data
-    id_gen = itertools.count(1)
 
     # grid height
     grid_h = 20

examples/charts/charts/agents.py

@@ -67,7 +67,7 @@ def do_business(self):
         bank can loan them any money"""
         if self.savings > 0 or self.wallet > 0 or self.bank.bank_to_loan > 0:
             # create list of people at my location (includes self)
-            my_cell = [a for a in self.cell.agents if not a == self]
+            my_cell = [a for a in self.cell.agents if a != self]
             # check if other people are at my location
             if len(my_cell) > 1:
                 # set customer to self for while loop condition

examples/charts/charts/model.py

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

examples/forest_fire/forest_fire/model.py

@@ -1,5 +1,4 @@
 import mesa
-
 from mesa.experimental.cell_space import OrthogonalMooreGrid
 
 from .agent import TreeCell

examples/hex_snowflake/hex_snowflake/cell.py

@@ -1,4 +1,3 @@
-import mesa
 
 from mesa.experimental.cell_space import FixedAgent
 

examples/hex_snowflake/hex_snowflake/model.py

@@ -20,7 +20,7 @@ def __init__(self, width=50, height=50):
 
         # Place a dead cell at each location.
         for entry in self.grid.all_cells:
-            cell = Cell(entry, self)
+            Cell(entry, self)
 
         # activate the center(ish) cell.
         centerish_cell = self.grid[(width // 2, height // 2)]

examples/hotelling_law/hotelling_law/agents.py

@@ -2,7 +2,6 @@
 import random
 
 import numpy as np
-
 from mesa.experimental.cell_space import CellAgent
 
 

examples/hotelling_law/hotelling_law/model.py

@@ -2,7 +2,6 @@
 
 import numpy as np
 from mesa import Model
-from mesa.agent import AgentSet
 from mesa.datacollection import DataCollector
 from mesa.experimental.cell_space import OrthogonalMooreGrid
 

examples/pd_grid/pd_grid/agent.py

@@ -1,4 +1,3 @@
-import mesa
 
 from mesa.experimental.cell_space import CellAgent
 
@@ -32,9 +31,7 @@ def step(self):
         if better than own score."""
 
         # neighbors = self.model.grid.get_neighbors(self.pos, True, include_center=True)
-        neighbors = list(self.cell.neighborhood.agents) + [
-            self,
-        ]
+        neighbors = [*list(self.cell.neighborhood.agents),  self]
         best_neighbor = max(neighbors, key=lambda a: a.score)
         self.next_move = best_neighbor.move