moved sampling to last step (otherwise, can sample outside of final m…

…ask)
projectmesa · Jul 2, 2024 · ba7d17b · ba7d17b
1 parent 4a8ab48
commit ba7d17b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/mesa_frames/concrete/agentset_pandas.py b/mesa_frames/concrete/agentset_pandas.py
@@ -248,15 +248,15 @@ def select(
     ) -> Self:
         obj = self._get_obj(inplace)
         bool_mask = obj._get_bool_mask(mask)
+        if filter_func:
+            bool_mask = bool_mask & obj._get_bool_mask(filter_func(obj))
+        if negate:
+            bool_mask = ~bool_mask
         if n is not None:
             bool_mask = pd.Series(
                 obj._agents.index.isin(obj._agents[bool_mask].sample(n).index),
                 index=obj._agents.index,
             )
-        if filter_func:
-            bool_mask = bool_mask & obj._get_bool_mask(filter_func(obj))
-        if negate:
-            bool_mask = ~bool_mask
         obj._mask = bool_mask
         return obj