continual-foragax 0.12.0__py3-none-any.whl → 0.14.0__py3-none-any.whl

{continual_foragax-0.12.0.dist-info → continual_foragax-0.14.0.dist-info}/METADATA

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

{continual_foragax-0.12.0.dist-info → continual_foragax-0.14.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=EyT6KY0d0mXNh6yw10V-8SJVAdyPAGKtRdFV4wXq-JM,19836
-foragax/objects.py,sha256=_TO7tBFCzH5L3JwzHK4bPIh090mtlWBSXcPsZ4y0gHg,6745
-foragax/registry.py,sha256=CjD1eRlY5956royMUPLYuZ3twVcuI9pbRN9M0TEagmo,3437
+foragax/objects.py,sha256=-XkuZVbbSTFNJ02f6HsH4GbxZ6YrUetiY39r9Zw4UWE,6967
+foragax/registry.py,sha256=-Vj8fXlW8xbpCM6ZhEp0hc3EIGBUqP7tIaI2dwWv7RE,4972
 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.12.0.dist-info/METADATA,sha256=yHZYcu0knPEtTUHbAcIGNx9EEqkZpCs_UT3TwAh6bOM,4897
-continual_foragax-0.12.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-continual_foragax-0.12.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
-continual_foragax-0.12.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
-continual_foragax-0.12.0.dist-info/RECORD,,
+continual_foragax-0.14.0.dist-info/METADATA,sha256=8IVQW9CR42G8PrAfd5oi4hCLLAULf5JUSNaAkYNS14k,4897
+continual_foragax-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+continual_foragax-0.14.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
+continual_foragax-0.14.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
+continual_foragax-0.14.0.dist-info/RECORD,,

foragax/objects.py

@@ -214,7 +214,10 @@ GREEN_FAKE = DefaultForagaxObject(
 
 
 def create_weather_objects(
-    file_index: int = 0, repeat: int = 500, multiplier: float = 1.0
+    file_index: int = 0,
+    repeat: int = 500,
+    multiplier: float = 1.0,
+    same_color: bool = False,
 ):
     """Create HOT and COLD WeatherObject instances using the specified file.
 
@@ -222,6 +225,7 @@ def create_weather_objects(
         file_index: Index into `FILE_PATHS` to select the temperature file.
         repeat: How many steps each temperature value repeats for.
         multiplier: Base multiplier applied to HOT; COLD will use -multiplier.
+        same_color: If True, both HOT and COLD use the same color.
 
     Returns:
         A tuple (HOT, COLD) of WeatherObject instances.
@@ -234,20 +238,23 @@ def create_weather_objects(
 
     rewards = load_data(FILE_PATHS[file_index])
 
+    hot_color = (63, 30, 25) if same_color else (255, 0, 255)
+
     hot = WeatherObject(
         name="hot",
         rewards=rewards,
         repeat=repeat,
         multiplier=multiplier,
-        color=(255, 0, 255),
+        color=hot_color,
     )
 
+    cold_color = hot_color if same_color else (0, 255, 255)
     cold = WeatherObject(
         name="cold",
         rewards=rewards,
         repeat=repeat,
         multiplier=-multiplier,
-        color=(0, 255, 255),
+        color=cold_color,
     )
 
     return hot, cold

foragax/registry.py

@@ -31,6 +31,19 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
             # Cold biome
             Biome(start=(0, 10), stop=(15, 12), object_frequencies=(0.0, 0.5)),
         ),
+        "nowrap": False,
+    },
+    "ForagaxWeather-v2": {
+        "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": True,
     },
     "ForagaxTwoBiome-v1": {
         "size": (15, 15),
@@ -44,6 +57,21 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
                 start=(10, 0), stop=(12, 15), object_frequencies=(0.0, 0.5, 0.0, 0.25)
             ),
         ),
+        "nowrap": False,
+    },
+    "ForagaxTwoBiome-v2": {
+        "size": (15, 15),
+        "aperture_size": None,
+        "objects": (BROWN_MOREL, BROWN_OYSTER, GREEN_DEATHCAP, GREEN_FAKE),
+        "biomes": (
+            # Morel biome
+            Biome(start=(3, 0), stop=(5, 15), object_frequencies=(0.5, 0.0, 0.25, 0.0)),
+            # Oyster biome
+            Biome(
+                start=(10, 0), stop=(12, 15), object_frequencies=(0.0, 0.5, 0.0, 0.25)
+            ),
+        ),
+        "nowrap": True,
     },
     "ForagaxTwoBiomeSmall-v1": {
         "size": (16, 8),
@@ -55,6 +83,7 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
             # Oyster biome
             Biome(start=(10, 2), stop=(14, 6), object_frequencies=(0.0, 1.0)),
         ),
+        "nowrap": False,
     },
     "ForagaxTwoBiomeSmall-v2": {
         "size": (16, 8),
@@ -66,6 +95,19 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
             # Oyster biome
             Biome(start=(11, 3), stop=(14, 6), object_frequencies=(0.0, 1.0)),
         ),
+        "nowrap": False,
+    },
+    "ForagaxTwoBiomeSmall-v3": {
+        "size": (16, 8),
+        "aperture_size": None,
+        "objects": (MEDIUM_MOREL, LARGE_OYSTER),
+        "biomes": (
+            # Morel biome
+            Biome(start=(3, 3), stop=(6, 6), object_frequencies=(1.0, 0.0)),
+            # Oyster biome
+            Biome(start=(11, 3), stop=(14, 6), object_frequencies=(0.0, 1.0)),
+        ),
+        "nowrap": True,
     },
 }
 
@@ -75,7 +117,7 @@ def make(
     observation_type: str = "object",
     aperture_size: Optional[Tuple[int, int]] = (5, 5),
     file_index: int = 0,
-    nowrap: bool = False,
+    nowrap: Optional[bool] = None,
 ) -> ForagaxEnv:
     """Create a Foragax environment.
 
@@ -84,8 +126,9 @@ def make(
         observation_type: The type of observation to use. One of "object", "rgb", or "world".
         aperture_size: The size of the agent's observation aperture. If None, the default
             for the environment is used.
-        file_index: File index for weather objects.
-        nowrap: If True, disables wrapping around environment boundaries.
+        file_index: File index for weather objects. nowrap: If True, disables
+        wrapping around environment boundaries. If None, uses defaults per
+        environment.
 
     Returns:
         A Foragax environment instance.
@@ -96,10 +139,12 @@ def make(
     config = ENV_CONFIGS[env_id].copy()
 
     config["aperture_size"] = aperture_size
-    config["nowrap"] = nowrap
+    if nowrap is not None:
+        config["nowrap"] = nowrap
 
     if env_id.startswith("ForagaxWeather"):
-        hot, cold = create_weather_objects(file_index=file_index)
+        same_color = env_id == "ForagaxWeather-v2"
+        hot, cold = create_weather_objects(file_index=file_index, same_color=same_color)
         config["objects"] = (hot, cold)
 
     env_class_map = {