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

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

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

{continual_foragax-0.34.0.dist-info → continual_foragax-0.36.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=l80niatCet3Kdveev8rIScTQwkmmnxIh4AhZgL7CJOA,66099
-foragax/objects.py,sha256=9wv0ZKT89dDkaeVwUwkVo4dwhRVeUxvsTyhoyYKfOEw,26508
-foragax/registry.py,sha256=G_xpDsSJIclEjqxU_xtkOhv4KvPLp5y8Cq2x7VsasiQ,18092
+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/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.34.0.dist-info/METADATA,sha256=E0gsxBGuPG2UZhCmNyWNlg6SGAkPi1tjtnqgwC69t1g,4713
-continual_foragax-0.34.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-continual_foragax-0.34.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
-continual_foragax-0.34.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
-continual_foragax-0.34.0.dist-info/RECORD,,
+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,,

foragax/env.py

@@ -690,11 +690,16 @@ class ForagaxEnv(environment.Environment):
 
         num_biomes = self.biome_object_frequencies.shape[0]
 
-        # Compute consumption rates for all biomes
-        consumption_rates = biome_state.consumption_count / jnp.maximum(
-            1.0, biome_state.total_objects.astype(float)
-        )
-        should_respawn = consumption_rates >= self.biome_consumption_threshold
+        if isinstance(self.biome_consumption_threshold, float):
+            # Compute consumption rates for all biomes
+            consumption_rates = biome_state.consumption_count / jnp.maximum(
+                1.0, biome_state.total_objects.astype(float)
+            )
+            should_respawn = consumption_rates >= self.biome_consumption_threshold
+        else:
+            should_respawn = (
+                biome_state.consumption_count >= self.biome_consumption_threshold
+            )
 
         # Split key for all biomes in parallel
         key, subkey = jax.random.split(key)

foragax/objects.py

@@ -240,6 +240,7 @@ class FourierObject(BaseForagaxObject):
         color: Tuple[int, int, int] = (0, 0, 0),
         reward_delay: int = 0,
         max_reward_delay: Optional[int] = None,
+        regen_delay: Optional[Tuple[int, int]] = None,
     ):
         if max_reward_delay is None:
             max_reward_delay = reward_delay
@@ -248,13 +249,14 @@ class FourierObject(BaseForagaxObject):
             blocking=False,
             collectable=True,
             color=color,
-            random_respawn=False,  # Objects don't respawn individually
+            random_respawn=True,
             max_reward_delay=max_reward_delay,
             expiry_time=None,
         )
         self.num_fourier_terms = num_fourier_terms
         self.base_magnitude = base_magnitude
         self.reward_delay_val = reward_delay
+        self.regen_delay_range = regen_delay
 
     def get_state(self, key: jax.Array) -> jax.Array:
         """Generate random Fourier series parameters.
@@ -353,6 +355,9 @@ class FourierObject(BaseForagaxObject):
 
     def regen_delay(self, clock: int, rng: jax.Array) -> int:
         """No individual regeneration - returns infinity."""
+        if self.regen_delay_range is not None:
+            min_delay, max_delay = self.regen_delay_range
+            return jax.random.randint(rng, (), min_delay, max_delay)
         return jnp.iinfo(jnp.int32).max
 
     def expiry_regen_delay(self, clock: int, rng: jax.Array) -> int:
@@ -709,6 +714,7 @@ def create_fourier_objects(
     num_fourier_terms: int = 10,
     base_magnitude: float = 1.0,
     reward_delay: int = 0,
+    regen_delay: Optional[Tuple[int, int]] = None,
 ):
     """Create HOT and COLD FourierObject instances.
 
@@ -726,6 +732,7 @@ def create_fourier_objects(
         base_magnitude=base_magnitude,
         color=(0, 0, 0),
         reward_delay=reward_delay,
+        regen_delay=regen_delay,
     )
 
     cold = FourierObject(
@@ -734,6 +741,7 @@ def create_fourier_objects(
         base_magnitude=base_magnitude,
         color=(0, 0, 0),
         reward_delay=reward_delay,
+        regen_delay=regen_delay,
     )
 
     return hot, cold

foragax/registry.py

@@ -104,6 +104,30 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
         "dynamic_biomes": True,
         "biome_consumption_threshold": 0.9,
     },
+    "ForagaxDiwali-v2": {
+        "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": 200,
+    },
+    "ForagaxDiwali-v3": {
+        "size": (15, 15),
+        "aperture_size": None,
+        "objects": None,
+        "biomes": (Biome(start=(0, 0), stop=(15, 15), object_frequencies=(0.5,)),),
+        "nowrap": False,
+        "deterministic_spawn": True,
+        "dynamic_biomes": True,
+    },
     "ForagaxTwoBiome-v1": {
         "size": (15, 15),
         "aperture_size": None,
@@ -539,6 +563,18 @@ def make(
             num_fourier_terms=10,
             reward_delay=reward_delay,
         )
+    if env_id == "ForagaxDiwali-v2":
+        config["objects"] = create_fourier_objects(
+            num_fourier_terms=10,
+            reward_delay=reward_delay,
+            regen_delay=(9, 11),
+        )
+    if env_id == "ForagaxDiwali-v3":
+        config["objects"] = create_fourier_objects(
+            num_fourier_terms=10,
+            reward_delay=reward_delay,
+            regen_delay=(9, 11),
+        )[:1]
 
     if env_id == "ForagaxSineTwoBiome-v1":
         biome1_oyster, biome1_deathcap, biome2_oyster, biome2_deathcap = (