perf: Access grid only once

projectmesa · Aug 3, 2023 · 7adf4ad · 7adf4ad
1 parent 2cec830
commit 7adf4ad
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/mesa/space.py b/mesa/space.py
@@ -394,8 +394,9 @@ def iter_cell_list_contents(
         """
         # iter_cell_list_contents returns only non-empty contents.
         return (
-            self._grid[x][y]
-            for x, y in itertools.filterfalse(self.is_cell_empty, cell_list)
+            cell
+            for x, y in cell_list
+            if (cell := self._grid[x][y]) != self.default_val()
         )
 
     @accept_tuple_argument
@@ -568,8 +569,9 @@ def iter_cell_list_contents(
             An iterator of the agents contained in the cells identified in `cell_list`.
         """
         return itertools.chain.from_iterable(
-            self._grid[x][y]
-            for x, y in itertools.filterfalse(self.is_cell_empty, cell_list)
+            cell
+            for x, y in cell_list
+            if (cell := self._grid[x][y]) != self.default_val()
         )