continual-foragax 0.25.0__py3-none-any.whl → 0.27.0__py3-none-any.whl

{continual_foragax-0.25.0.dist-info → continual_foragax-0.27.0.dist-info}/METADATA

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

{continual_foragax-0.25.0.dist-info → continual_foragax-0.27.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=w9KDLRm0xvJjnRP0C4gynk1At6LVdrz5xBEtDC3ePvM,24958
-foragax/objects.py,sha256=CblI0NI7PQzeKk3MZa8sbaa9wB4pc_8CyOGbJOFWytE,9391
-foragax/registry.py,sha256=ExsKKatqsQBpEpgE-xUCFOHxuXoBVysJk5eR1OoI7kw,13456
+foragax/env.py,sha256=2Z2-3wjL_gHCqehMFsZA761VlUWQvsTU6PawoTtzcCY,25103
+foragax/objects.py,sha256=FCLZ-8d7qq9VMTG6G-TaRt842-sjgB0-DH0IoHwwngI,9503
+foragax/registry.py,sha256=7-6VDN1MKVEvX_1u5G8NkSpv9BccEmtjJa77-OTNg3A,14324
 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.25.0.dist-info/METADATA,sha256=GXiKdIYRxCL0MgjTkPK1xWa-3bNh2rBvloPEnict1Rc,4897
-continual_foragax-0.25.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-continual_foragax-0.25.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
-continual_foragax-0.25.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
-continual_foragax-0.25.0.dist-info/RECORD,,
+continual_foragax-0.27.0.dist-info/METADATA,sha256=Axd__jkh5OIh1T9CmzB9IarAguoWNvsECjllZ20mG3w,4897
+continual_foragax-0.27.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+continual_foragax-0.27.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
+continual_foragax-0.27.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
+continual_foragax-0.27.0.dist-info/RECORD,,

foragax/env.py

@@ -273,6 +273,8 @@ class ForagaxEnv(environment.Environment):
             info["temperature"] = get_temperature(
                 self.weather_object.rewards, state.time, self.weather_object.repeat
             )
+        info["biome_id"] = state.biome_grid[pos[1], pos[0]]
+        info["object_collected_id"] = jax.lax.select(should_collect, obj_at_pos, -1)
 
         # 4. UPDATE STATE
         state = EnvState(

foragax/objects.py

@@ -318,6 +318,7 @@ def create_weather_objects(
     repeat: int = 500,
     multiplier: float = 1.0,
     same_color: bool = False,
+    random_respawn: bool = False,
 ):
     """Create HOT and COLD WeatherObject instances using the specified file.
 
@@ -346,6 +347,7 @@ def create_weather_objects(
         repeat=repeat,
         multiplier=multiplier,
         color=hot_color,
+        random_respawn=random_respawn,
     )
 
     cold_color = hot_color if same_color else (0, 255, 255)
@@ -355,6 +357,7 @@ def create_weather_objects(
         repeat=repeat,
         multiplier=-multiplier,
         color=cold_color,
+        random_respawn=random_respawn,
     )
 
     return hot, cold

foragax/registry.py

@@ -64,6 +64,27 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
         "biomes": None,
         "nowrap": True,
     },
+    "ForagaxWeather-v4": {
+        "size": None,
+        "aperture_size": None,
+        "objects": None,
+        "biomes": None,
+        "nowrap": True,
+        "deterministic_spawn": True,
+    },
+    "ForagaxWeather-v5": {
+        "size": (15, 15),
+        "aperture_size": None,
+        "objects": None,
+        "biomes": (
+            # Hot biome
+            Biome(start=(0, 3), stop=(15, 5), object_frequencies=(0.5, 0.0)),
+            # Cold biome
+            Biome(start=(0, 10), stop=(15, 12), object_frequencies=(0.0, 0.5)),
+        ),
+        "nowrap": False,
+        "deterministic_spawn": True,
+    },
     "ForagaxTwoBiome-v1": {
         "size": (15, 15),
         "aperture_size": None,
@@ -400,7 +421,7 @@ def make(
             ),
         )
 
-    if env_id == "ForagaxWeather-v3":
+    if env_id in ("ForagaxWeather-v3", "ForagaxWeather-v4"):
         margin = aperture_size[1] // 2 + 1
         width = 2 * margin + 9
         config["size"] = (15, width)
@@ -420,8 +441,16 @@ def make(
         )
 
     if env_id.startswith("ForagaxWeather"):
-        same_color = env_id in ("ForagaxWeather-v2", "ForagaxWeather-v3")
-        hot, cold = create_weather_objects(file_index=file_index, same_color=same_color)
+        same_color = env_id in (
+            "ForagaxWeather-v2",
+            "ForagaxWeather-v3",
+            "ForagaxWeather-v4",
+            "ForagaxWeather-v5",
+        )
+        random_respawn = env_id in ("ForagaxWeather-v4", "ForagaxWeather-v5")
+        hot, cold = create_weather_objects(
+            file_index=file_index, same_color=same_color, random_respawn=random_respawn
+        )
         config["objects"] = (hot, cold)
 
     if env_id == "ForagaxTwoBiome-v16":