continual-foragax 0.12.0__tar.gz → 0.14.0__tar.gz

{continual_foragax-0.12.0 → continual_foragax-0.14.0}/PKG-INFO

@@ -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 → continual_foragax-0.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "continual-foragax"
-version = "0.12.0"
+version = "0.14.0"
 description = "A continual reinforcement learning benchmark"
 readme = "README.md"
 authors = [
@@ -30,7 +30,7 @@ build-backend = "setuptools.build_meta"
 [tool]
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.12.0"
+version = "0.14.0"
 tag_format = "$version"
 version_files = ["pyproject.toml"]
 

{continual_foragax-0.12.0 → continual_foragax-0.14.0}/src/continual_foragax.egg-info/PKG-INFO

@@ -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 → continual_foragax-0.14.0}/src/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

{continual_foragax-0.12.0 → continual_foragax-0.14.0}/src/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 = {