continual-foragax 0.36.0__py3-none-any.whl → 0.37.0__py3-none-any.whl

{continual_foragax-0.36.0.dist-info → continual_foragax-0.37.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: continual-foragax
-Version: 0.36.0
+Version: 0.37.0
 Summary: A continual reinforcement learning benchmark
 Author-email: Steven Tang <stang5@ualberta.ca>
 Requires-Python: >=3.8

{continual_foragax-0.36.0.dist-info → continual_foragax-0.37.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 foragax/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 foragax/colors.py,sha256=rqNPiywP4Nvr0POhsGpasRk-nMMTS3DOwFRUgperlUk,2065
-foragax/env.py,sha256=K3noPwdYmQlnXVjslqVzX_FIB-CnOh37mWFArQXnf_Y,66324
-foragax/objects.py,sha256=PPuLYjD7em7GL404eSpP6q8TxF8p7JtQ1kIwh7uD_tU,26860
-foragax/registry.py,sha256=y_MEvM0K_E4fzdp4XokzLh1D94UAuCu16wGwJV4wa_A,19289
+foragax/env.py,sha256=7IhLCEosM_IH19sMzRnGMvTNq9tlhVg4PU52hGz9XLE,66531
+foragax/objects.py,sha256=aVc7lD3CTyRP9wm_Vs93qo4l_B1kbiYGKPtkd_SVXjs,27061
+foragax/registry.py,sha256=dTdRwNNW8jfeDxioYCx4-GtL-J8t1nGwt7gDwDvN5TY,20016
 foragax/rendering.py,sha256=bms7wvBZTofoR-K-2QD2Ggeed7Viw8uwAEiEpEM3eSo,2768
 foragax/weather.py,sha256=KNAiwuFz8V__6G75vZIWQKPocLzXqxXn-Vt4TbHIpcA,1258
 foragax/data/ECA_non-blended_custom/TG_SOUID100897.txt,sha256=N7URbX6VlCZvCboUogYjMzy1I-0cfNPOn0QTLSHHfQ0,1776751
@@ -128,8 +128,8 @@ foragax/data/ECA_non-blended_custom/TG_SOUID156887.txt,sha256=juzTPgJoJxfqmZkorL
 foragax/data/ECA_non-blended_custom/elements.txt,sha256=OtcUBoDAHxuln79BPKGu0tsQxG_5G2BfAX3Ck130kEA,4507
 foragax/data/ECA_non-blended_custom/metadata.txt,sha256=nudnmOCy5cPJfSXt_IjyX0S5-T7NkCZREICZSimqeqc,48260
 foragax/data/ECA_non-blended_custom/sources.txt,sha256=1j3lSmINAoCMqPqFrHfZJriOz6sTYZNOhXzUwvTLas0,20857
-continual_foragax-0.36.0.dist-info/METADATA,sha256=FZVOu8G1yekPfxV7NxyWBXWRdTECWYB3gh08v2o4NIQ,4713
-continual_foragax-0.36.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-continual_foragax-0.36.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
-continual_foragax-0.36.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
-continual_foragax-0.36.0.dist-info/RECORD,,
+continual_foragax-0.37.0.dist-info/METADATA,sha256=fWAIh_Yq86ibXEtNLXKrqjcgxtoMPS0Em_q_UU8XZ8Q,4713
+continual_foragax-0.37.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+continual_foragax-0.37.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
+continual_foragax-0.37.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
+continual_foragax-0.37.0.dist-info/RECORD,,

foragax/env.py

@@ -132,6 +132,7 @@ class ForagaxEnv(environment.Environment):
         observation_type: str = "object",
         dynamic_biomes: bool = False,
         biome_consumption_threshold: float = 0.9,
+        max_expiries_per_step: int = 1,
     ):
         super().__init__()
         self._name = name
@@ -155,6 +156,9 @@ class ForagaxEnv(environment.Environment):
         self.teleport_interval = teleport_interval
         self.dynamic_biomes = dynamic_biomes
         self.biome_consumption_threshold = biome_consumption_threshold
+        if max_expiries_per_step < 1:
+            raise ValueError("max_expiries_per_step must be at least 1")
+        self.max_expiries_per_step = max_expiries_per_step
 
         objects = (EMPTY,) + objects
         if self.nowrap and not self.full_world:
@@ -608,63 +612,63 @@ class ForagaxEnv(environment.Environment):
                 & (current_objects_for_expiry > 0)
             )
 
-            # Count how many objects actually need to expire
-            num_expiring = jnp.sum(should_expire)
-
             # Only process expiry if there are actually objects to expire
-            def process_expiries():
-                # Get positions of objects that should expire
-                # Use nonzero with fixed size to maintain JIT compatibility
-                max_objects = self.size[0] * self.size[1]
-                y_indices, x_indices = jnp.nonzero(
-                    should_expire, size=max_objects, fill_value=-1
-                )
+            has_expiring = jnp.any(should_expire)
+
+            # Precompute the first expiring index in flat space so the work inside cond is minimal.
+            overage = jnp.where(
+                should_expire,
+                object_ages - expiry_times,
+                -jnp.inf,
+            ).reshape(-1)
+            sorted_flat_indices = jnp.argsort(overage)[::-1]
+            selected_flat_indices = jnp.where(
+                overage[sorted_flat_indices] > -jnp.inf,
+                sorted_flat_indices,
+                -jnp.ones_like(sorted_flat_indices),
+            )[: self.max_expiries_per_step]
 
+            def process_expiries():
                 key_local, expiry_key = jax.random.split(key)
 
-                def process_one_expiry(carry, i):
-                    obj_state = carry
-                    y = y_indices[i]
-                    x = x_indices[i]
+                def body_fn(i, obj_state):
+                    flat_idx = selected_flat_indices[i]
 
-                    # Skip if this is a padding index (from fill_value)
-                    is_valid = (y >= 0) & (x >= 0)
-
-                    def expire_one():
+                    def expire_at(obj_state):
+                        y = flat_idx // self.size[0]
+                        x = flat_idx % self.size[0]
                         obj_id = current_objects_for_expiry[y, x]
-                        exp_key = jax.random.fold_in(expiry_key, y * self.size[0] + x)
+                        exp_key = jax.random.fold_in(expiry_key, flat_idx)
                         exp_delay = jax.lax.switch(
                             obj_id, self.expiry_regen_delay_fns, state.time, exp_key
                         )
                         timer_countdown = jax.lax.cond(
                             exp_delay == jnp.iinfo(jnp.int32).max,
-                            lambda: 0,  # No timer (permanent removal)
-                            lambda: exp_delay + 1,  # Timer countdown
+                            lambda: 0,
+                            lambda: exp_delay + 1,
                         )
 
-                        # Use unified timer placement method
-                        rand_key = jax.random.split(exp_key)[1]
-                        new_obj_state = self._place_timer(
+                        respawn_random = self.object_random_respawn[obj_id]
+                        rand_key = jax.random.fold_in(exp_key, 1)
+                        return self._place_timer(
                             obj_state,
                             y,
                             x,
                             obj_id,
                             timer_countdown,
-                            self.object_random_respawn[obj_id],
+                            respawn_random,
                             rand_key,
                         )
 
-                        return new_obj_state
-
-                    def no_op():
-                        return obj_state
-
-                    return jax.lax.cond(is_valid, expire_one, no_op), None
+                    return jax.lax.cond(
+                        flat_idx >= 0,
+                        expire_at,
+                        lambda obj_state: obj_state,
+                        obj_state,
+                    )
 
-                new_object_state, _ = jax.lax.scan(
-                    process_one_expiry,
-                    object_state,
-                    jnp.arange(max_objects),
+                new_object_state = jax.lax.fori_loop(
+                    0, self.max_expiries_per_step, body_fn, object_state
                 )
                 return key_local, new_object_state
 
@@ -672,7 +676,7 @@ class ForagaxEnv(environment.Environment):
                 return key, object_state
 
             key, object_state = jax.lax.cond(
-                num_expiring > 0,
+                has_expiring,
                 process_expiries,
                 no_expiries,
             )

foragax/objects.py

@@ -241,6 +241,7 @@ class FourierObject(BaseForagaxObject):
         reward_delay: int = 0,
         max_reward_delay: Optional[int] = None,
         regen_delay: Optional[Tuple[int, int]] = None,
+        reward_repeat: int = 1,
     ):
         if max_reward_delay is None:
             max_reward_delay = reward_delay
@@ -257,6 +258,7 @@ class FourierObject(BaseForagaxObject):
         self.base_magnitude = base_magnitude
         self.reward_delay_val = reward_delay
         self.regen_delay_range = regen_delay
+        self.reward_repeat = reward_repeat
 
     def get_state(self, key: jax.Array) -> jax.Array:
         """Generate random Fourier series parameters.
@@ -321,7 +323,7 @@ class FourierObject(BaseForagaxObject):
         y_max = params[2]
 
         # Normalize time to [0, 2π] using the object's period
-        t = 2.0 * jnp.pi * (clock % period) / period
+        t = 2.0 * jnp.pi * ((clock // self.reward_repeat) % period) / period
 
         # Extract interleaved coefficients: [a1, b1, a2, b2, ...]
         ab_coeffs = params[3:]
@@ -715,6 +717,7 @@ def create_fourier_objects(
     base_magnitude: float = 1.0,
     reward_delay: int = 0,
     regen_delay: Optional[Tuple[int, int]] = None,
+    reward_repeat: int = 1,
 ):
     """Create HOT and COLD FourierObject instances.
 
@@ -733,6 +736,7 @@ def create_fourier_objects(
         color=(0, 0, 0),
         reward_delay=reward_delay,
         regen_delay=regen_delay,
+        reward_repeat=reward_repeat,
     )
 
     cold = FourierObject(
@@ -742,6 +746,7 @@ def create_fourier_objects(
         color=(0, 0, 0),
         reward_delay=reward_delay,
         regen_delay=regen_delay,
+        reward_repeat=reward_repeat,
     )
 
     return hot, cold

foragax/registry.py

@@ -128,6 +128,21 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
         "deterministic_spawn": True,
         "dynamic_biomes": True,
     },
+    "ForagaxDiwali-v4": {
+        "size": (15, 15),
+        "aperture_size": None,
+        "objects": None,
+        "biomes": (
+            # Hot biome
+            Biome(start=(0, 2), stop=(15, 6), object_frequencies=(0.5, 0.0)),
+            # Cold biome
+            Biome(start=(0, 9), stop=(15, 13), object_frequencies=(0.0, 0.5)),
+        ),
+        "nowrap": False,
+        "deterministic_spawn": True,
+        "dynamic_biomes": True,
+        "biome_consumption_threshold": 1000,
+    },
     "ForagaxTwoBiome-v1": {
         "size": (15, 15),
         "aperture_size": None,
@@ -575,6 +590,13 @@ def make(
             reward_delay=reward_delay,
             regen_delay=(9, 11),
         )[:1]
+    if env_id == "ForagaxDiwali-v4":
+        config["objects"] = create_fourier_objects(
+            num_fourier_terms=10,
+            reward_delay=reward_delay,
+            regen_delay=(9, 11),
+            reward_repeat=100,
+        )
 
     if env_id == "ForagaxSineTwoBiome-v1":
         biome1_oyster, biome1_deathcap, biome2_oyster, biome2_deathcap = (