continual-foragax 0.17.0__tar.gz → 0.19.0__tar.gz

{continual_foragax-0.17.0 → continual_foragax-0.19.0}/PKG-INFO

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

{continual_foragax-0.17.0 → continual_foragax-0.19.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "continual-foragax"
-version = "0.17.0"
+version = "0.19.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.17.0"
+version = "0.19.0"
 tag_format = "$version"
 version_files = ["pyproject.toml"]
 

{continual_foragax-0.17.0 → continual_foragax-0.19.0}/src/continual_foragax.egg-info/PKG-INFO

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

{continual_foragax-0.17.0 → continual_foragax-0.19.0}/src/foragax/env.py

@@ -355,17 +355,31 @@ class ForagaxEnv(environment.Environment):
             # Create indices for the aperture
             y_offsets = jnp.arange(ap_h)
             x_offsets = jnp.arange(ap_w)
-            y_coords = jnp.mod(start_y + y_offsets[:, None], self.size[1])
-            x_coords = jnp.mod(start_x + x_offsets, self.size[0])
-
-            # Get original colors from the aperture area
-            original_colors = img[y_coords, x_coords]
-
-            # Calculate tinted colors
-            tinted_colors = (1 - alpha) * original_colors + alpha * agent_color
-
-            # Update the image with tinted colors
-            img = img.at[y_coords, x_coords].set(tinted_colors)
+            y_coords_original = start_y + y_offsets[:, None]
+            x_coords_original = start_x + x_offsets
+
+            if self.nowrap:
+                y_coords = jnp.clip(y_coords_original, 0, self.size[1] - 1)
+                x_coords = jnp.clip(x_coords_original, 0, self.size[0] - 1)
+                in_bounds = (
+                    (y_coords_original >= 0)
+                    & (y_coords_original < self.size[1])
+                    & (x_coords_original >= 0)
+                    & (x_coords_original < self.size[0])
+                )
+                original_colors = img[y_coords, x_coords]
+                tinted_colors = (1 - alpha) * original_colors + alpha * agent_color
+                img = img.at[y_coords, x_coords].set(
+                    jnp.where(
+                        in_bounds[..., None], tinted_colors, img[y_coords, x_coords]
+                    )
+                )
+            else:
+                y_coords = jnp.mod(y_coords_original, self.size[1])
+                x_coords = jnp.mod(x_coords_original, self.size[0])
+                original_colors = img[y_coords, x_coords]
+                tinted_colors = (1 - alpha) * original_colors + alpha * agent_color
+                img = img.at[y_coords, x_coords].set(tinted_colors)
 
             # Agent color
             img = img.at[state.pos[1], state.pos[0]].set(jnp.array(AGENT.color))

{continual_foragax-0.17.0 → continual_foragax-0.19.0}/src/foragax/registry.py

@@ -119,6 +119,27 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
         ),
         "nowrap": True,
     },
+    "ForagaxTwoBiome-v6": {
+        "size": (15, 15),
+        "aperture_size": None,
+        "objects": (BROWN_MOREL_2, BROWN_OYSTER, GREEN_DEATHCAP_3, GREEN_FAKE_2),
+        "biomes": (
+            # Morel biome
+            Biome(start=(3, 0), stop=(5, 15), object_frequencies=(0.25, 0.0, 0.5, 0.0)),
+            # Oyster biome
+            Biome(
+                start=(10, 0), stop=(12, 15), object_frequencies=(0.0, 0.25, 0.0, 0.5)
+            ),
+        ),
+        "nowrap": True,
+    },
+    "ForagaxTwoBiome-v7": {
+        "size": None,
+        "aperture_size": None,
+        "objects": (BROWN_MOREL_2, BROWN_OYSTER, GREEN_DEATHCAP_3, GREEN_FAKE_2),
+        "biomes": None,
+        "nowrap": True,
+    },
     "ForagaxTwoBiomeSmall-v1": {
         "size": (16, 8),
         "aperture_size": None,
@@ -183,11 +204,23 @@ def make(
         raise ValueError(f"Unknown env_id: {env_id}")
 
     config = ENV_CONFIGS[env_id].copy()
-
+    if isinstance(aperture_size, int):
+        aperture_size = (aperture_size, aperture_size)
     config["aperture_size"] = aperture_size
     if nowrap is not None:
         config["nowrap"] = nowrap
 
+    if env_id == "ForagaxTwoBiome-v7":
+        margin = aperture_size[1] // 2 + 1
+        width = 2 * margin + 9
+        config["size"] = (width, 15)
+        config["biomes"] = (
+            # Morel biome
+            Biome(start=(margin, 0), stop=(margin + 2, 15), object_frequencies=(0.25, 0.0, 0.5, 0.0)),
+            # Oyster biome
+            Biome(start=(margin + 7, 0), stop=(margin + 9, 15), object_frequencies=(0.0, 0.25, 0.0, 0.5)),
+        )
+
     if env_id.startswith("ForagaxWeather"):
         same_color = env_id == "ForagaxWeather-v2"
         hot, cold = create_weather_objects(file_index=file_index, same_color=same_color)