continual-foragax 0.10.2__py3-none-any.whl → 0.11.0__py3-none-any.whl

{continual_foragax-0.10.2.dist-info → continual_foragax-0.11.0.dist-info}/METADATA

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

{continual_foragax-0.10.2.dist-info → continual_foragax-0.11.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=Oo0jlvDXZTzV92yKJ08krRRg5yD1wSsvuIvxUrzMxu4,18748
-foragax/objects.py,sha256=CyBxrykTxpHCI_2hE9jE8mG4TU8R7VxzKdQ5mtxkEqU,6004
-foragax/registry.py,sha256=7_RDXvm_3RNO7culBLGkE0jH8Wk_q6jbMv72dZx4JO8,2722
+foragax/env.py,sha256=EyWJ67GLCJl2Re8s4AoVRGXbccgOGn0J_XxuuWJaGrE,18702
+foragax/objects.py,sha256=xLzeu9pN3vO8WSDdb1jvPzFlxP8CJV5RnShaL4Sq2LA,6665
+foragax/registry.py,sha256=wNpRcPIotsxa0R6qzGNJnXWqJvzHtxTRHSgRekYrIBc,3255
 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.10.2.dist-info/METADATA,sha256=fpB7XhrzvckiVovAFHYB3GUWdRKr2DhiUTRCLS815A4,4897
-continual_foragax-0.10.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-continual_foragax-0.10.2.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
-continual_foragax-0.10.2.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
-continual_foragax-0.10.2.dist-info/RECORD,,
+continual_foragax-0.11.0.dist-info/METADATA,sha256=yIwRR9B648S9_Y_013soFTIQYcVNRfeLxYp-pJ3AyZ0,4897
+continual_foragax-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+continual_foragax-0.11.0.dist-info/entry_points.txt,sha256=Qiu6iE_XudrDO_bVAMeA435h4PO9ourt8huvSHiuMPc,41
+continual_foragax-0.11.0.dist-info/top_level.txt,sha256=-z3SDK6RfLIcLI24n8rdbeFzlVY3hunChzlu-v1Fncs,8
+continual_foragax-0.11.0.dist-info/RECORD,,

foragax/env.py

@@ -19,9 +19,9 @@ from foragax.weather import get_temperature
 
 
 class Actions(IntEnum):
-    UP = 0
+    DOWN = 0
     RIGHT = 1
-    DOWN = 2
+    UP = 2
     LEFT = 3
 
 
@@ -434,7 +434,6 @@ class ForagaxObjectEnv(ForagaxEnv):
         # Decode grid for observation
         obs_grid = jnp.maximum(0, state.object_grid)
         aperture = self._get_aperture(obs_grid, state.pos)
-        aperture = jnp.flip(aperture, axis=0)
 
         # Handle case with no objects (only EMPTY)
         if self.num_color_channels == 0:

foragax/objects.py

@@ -179,6 +179,37 @@ DEATHCAP = DefaultForagaxObject(
 )
 AGENT = DefaultForagaxObject(name="agent", blocking=True, color=(0, 0, 255))
 
+BROWN_MOREL = NormalRegenForagaxObject(
+    name="brown_morel",
+    reward=30.0,
+    collectable=True,
+    color=(63, 30, 25),
+    mean_regen_delay=300,
+    std_regen_delay=30,
+)
+BROWN_OYSTER = NormalRegenForagaxObject(
+    name="brown_oyster",
+    reward=1.0,
+    collectable=True,
+    color=(63, 30, 25),
+    mean_regen_delay=10,
+    std_regen_delay=1,
+)
+GREEN_DEATHCAP = DefaultForagaxObject(
+    name="green_deathcap",
+    reward=-1.0,
+    collectable=True,
+    color=(0, 255, 0),
+    regen_delay=(10, 10),
+)
+GREEN_FAKE = DefaultForagaxObject(
+    name="green_fake",
+    reward=0.0,
+    collectable=True,
+    color=(0, 255, 0),
+    regen_delay=(10, 10),
+)
+
 
 def create_weather_objects(
     file_index: int = 0, repeat: int = 500, multiplier: float = 1.0

foragax/registry.py

@@ -10,6 +10,10 @@ from foragax.env import (
     ForagaxWorldEnv,
 )
 from foragax.objects import (
+    BROWN_MOREL,
+    BROWN_OYSTER,
+    GREEN_DEATHCAP,
+    GREEN_FAKE,
     LARGE_MOREL,
     LARGE_OYSTER,
     MEDIUM_MOREL,
@@ -28,6 +32,19 @@ ENV_CONFIGS: Dict[str, Dict[str, Any]] = {
             Biome(start=(0, 10), stop=(15, 12), object_frequencies=(0.0, 0.5)),
         ),
     },
+    "ForagaxTwoBiome-v1": {
+        "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)
+            ),
+        ),
+    },
     "ForagaxTwoBiomeSmall-v1": {
         "size": (16, 8),
         "aperture_size": None,