mettagrid 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

build/mettagrid/actions/swap.cpp

@@ -2322,8 +2322,8 @@ struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler {
 static struct __pyx_vtabstruct_9mettagrid_7actions_7actions_MettaActionHandler *__pyx_vtabptr_9mettagrid_7actions_7actions_MettaActionHandler;
 
 
-/* "mettagrid/actions/swap.pyx":13
- * from mettagrid.actions.actions cimport MettaActionHandler
+/* "mettagrid/actions/swap.pyx":15
+ * from mettagrid.objects.constants cimport GridLayer
  * 
  * cdef class Swap(MettaActionHandler):             # <<<<<<<<<<<<<<
  *     def __init__(self, cfg: OmegaConf):
@@ -19600,7 +19600,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec
   return __pyx_r;
 }
 
-/* "mettagrid/actions/swap.pyx":14
+/* "mettagrid/actions/swap.pyx":16
  * 
  * cdef class Swap(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):             # <<<<<<<<<<<<<<
@@ -19644,12 +19644,12 @@ static int __pyx_pw_9mettagrid_7actions_4swap_4Swap_1__init__(PyObject *__pyx_v_
           (void)__Pyx_Arg_NewRef_VARARGS(values[0]);
           kw_args--;
         }
-        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 14, __pyx_L3_error)
+        else if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 16, __pyx_L3_error)
         else goto __pyx_L5_argtuple_error;
       }
       if (unlikely(kw_args > 0)) {
         const Py_ssize_t kwd_pos_args = __pyx_nargs;
-        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(1, 14, __pyx_L3_error)
+        if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_kwvalues, __pyx_pyargnames, 0, values + 0, kwd_pos_args, "__init__") < 0)) __PYX_ERR(1, 16, __pyx_L3_error)
       }
     } else if (unlikely(__pyx_nargs != 1)) {
       goto __pyx_L5_argtuple_error;
@@ -19660,7 +19660,7 @@ static int __pyx_pw_9mettagrid_7actions_4swap_4Swap_1__init__(PyObject *__pyx_v_
   }
   goto __pyx_L6_skip;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 14, __pyx_L3_error)
+  __Pyx_RaiseArgtupleInvalid("__init__", 1, 1, 1, __pyx_nargs); __PYX_ERR(1, 16, __pyx_L3_error)
   __pyx_L6_skip:;
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L3_error:;
@@ -19699,14 +19699,14 @@ static int __pyx_pf_9mettagrid_7actions_4swap_4Swap___init__(struct __pyx_obj_9m
   int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__init__", 1);
 
-  /* "mettagrid/actions/swap.pyx":15
+  /* "mettagrid/actions/swap.pyx":17
  * cdef class Swap(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):
  *         MettaActionHandler.__init__(self, cfg, "swap")             # <<<<<<<<<<<<<<
  * 
  *     cdef unsigned char max_arg(self):
  */
-  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler), __pyx_n_s_init); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 15, __pyx_L1_error)
+  __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler), __pyx_n_s_init); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 17, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = NULL;
   __pyx_t_4 = 0;
@@ -19726,13 +19726,13 @@ static int __pyx_pf_9mettagrid_7actions_4swap_4Swap___init__(struct __pyx_obj_9m
     PyObject *__pyx_callargs[4] = {__pyx_t_3, ((PyObject *)__pyx_v_self), __pyx_v_cfg, __pyx_n_u_swap};
     __pyx_t_1 = __Pyx_PyObject_FastCall(__pyx_t_2, __pyx_callargs+1-__pyx_t_4, 3+__pyx_t_4);
     __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0;
-    if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 15, __pyx_L1_error)
+    if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 17, __pyx_L1_error)
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   }
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
-  /* "mettagrid/actions/swap.pyx":14
+  /* "mettagrid/actions/swap.pyx":16
  * 
  * cdef class Swap(MettaActionHandler):
  *     def __init__(self, cfg: OmegaConf):             # <<<<<<<<<<<<<<
@@ -19754,7 +19754,7 @@ static int __pyx_pf_9mettagrid_7actions_4swap_4Swap___init__(struct __pyx_obj_9m
   return __pyx_r;
 }
 
-/* "mettagrid/actions/swap.pyx":17
+/* "mettagrid/actions/swap.pyx":19
  *         MettaActionHandler.__init__(self, cfg, "swap")
  * 
  *     cdef unsigned char max_arg(self):             # <<<<<<<<<<<<<<
@@ -19765,7 +19765,7 @@ static int __pyx_pf_9mettagrid_7actions_4swap_4Swap___init__(struct __pyx_obj_9m
 static unsigned char __pyx_f_9mettagrid_7actions_4swap_4Swap_max_arg(CYTHON_UNUSED struct __pyx_obj_9mettagrid_7actions_4swap_Swap *__pyx_v_self) {
   unsigned char __pyx_r;
 
-  /* "mettagrid/actions/swap.pyx":18
+  /* "mettagrid/actions/swap.pyx":20
  * 
  *     cdef unsigned char max_arg(self):
  *         return 0             # <<<<<<<<<<<<<<
@@ -19775,7 +19775,7 @@ static unsigned char __pyx_f_9mettagrid_7actions_4swap_4Swap_max_arg(CYTHON_UNUS
   __pyx_r = 0;
   goto __pyx_L0;
 
-  /* "mettagrid/actions/swap.pyx":17
+  /* "mettagrid/actions/swap.pyx":19
  *         MettaActionHandler.__init__(self, cfg, "swap")
  * 
  *     cdef unsigned char max_arg(self):             # <<<<<<<<<<<<<<
@@ -19788,7 +19788,7 @@ static unsigned char __pyx_f_9mettagrid_7actions_4swap_4Swap_max_arg(CYTHON_UNUS
   return __pyx_r;
 }
 
-/* "mettagrid/actions/swap.pyx":20
+/* "mettagrid/actions/swap.pyx":22
  *         return 0
  * 
  *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
@@ -19798,31 +19798,68 @@ static unsigned char __pyx_f_9mettagrid_7actions_4swap_4Swap_max_arg(CYTHON_UNUS
 
 static int __pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action(struct __pyx_obj_9mettagrid_7actions_4swap_Swap *__pyx_v_self, CYTHON_UNUSED unsigned int __pyx_v_actor_id, Agent *__pyx_v_actor, CYTHON_UNUSED __pyx_t_9mettagrid_6action_ActionArg __pyx_v_arg) {
   GridLocation __pyx_v_target_loc;
-  Agent *__pyx_v_target;
+  MettaObject *__pyx_v_target;
   int __pyx_r;
   int __pyx_t_1;
 
-  /* "mettagrid/actions/swap.pyx":26
+  /* "mettagrid/actions/swap.pyx":28
  *         ActionArg arg):
  * 
  *         cdef GridLocation target_loc = self.env._grid.relative_location(             # <<<<<<<<<<<<<<
  *             actor.location,
- *         <Orientation>actor.orientation
+ *             <Orientation>actor.orientation
  */
   __pyx_v_target_loc = __pyx_v_self->__pyx_base.__pyx_base.env->_grid->relative_location(__pyx_v_actor->location, ((Orientation)__pyx_v_actor->orientation));
 
-  /* "mettagrid/actions/swap.pyx":30
- *         <Orientation>actor.orientation
+  /* "mettagrid/actions/swap.pyx":33
  *         )
- *         cdef Agent *target = <Agent*>self.env._grid.object_at(target_loc)             # <<<<<<<<<<<<<<
+ *         cdef MettaObject *target
+ *         target = <MettaObject*>self.env._grid.object_at(target_loc)             # <<<<<<<<<<<<<<
+ *         if target == NULL:
+ *             target_loc.layer = GridLayer.Object_Layer
+ */
+  __pyx_v_target = ((MettaObject *)__pyx_v_self->__pyx_base.__pyx_base.env->_grid->object_at(__pyx_v_target_loc));
+
+  /* "mettagrid/actions/swap.pyx":34
+ *         cdef MettaObject *target
+ *         target = <MettaObject*>self.env._grid.object_at(target_loc)
+ *         if target == NULL:             # <<<<<<<<<<<<<<
+ *             target_loc.layer = GridLayer.Object_Layer
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
+ */
+  __pyx_t_1 = (__pyx_v_target == NULL);
+  if (__pyx_t_1) {
+
+    /* "mettagrid/actions/swap.pyx":35
+ *         target = <MettaObject*>self.env._grid.object_at(target_loc)
+ *         if target == NULL:
+ *             target_loc.layer = GridLayer.Object_Layer             # <<<<<<<<<<<<<<
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
+ *         if target == NULL:
+ */
+    __pyx_v_target_loc.layer = Object_Layer;
+
+    /* "mettagrid/actions/swap.pyx":36
+ *         if target == NULL:
+ *             target_loc.layer = GridLayer.Object_Layer
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)             # <<<<<<<<<<<<<<
  *         if target == NULL:
  *             return False
  */
-  __pyx_v_target = ((Agent *)__pyx_v_self->__pyx_base.__pyx_base.env->_grid->object_at(__pyx_v_target_loc));
+    __pyx_v_target = ((MettaObject *)__pyx_v_self->__pyx_base.__pyx_base.env->_grid->object_at(__pyx_v_target_loc));
 
-  /* "mettagrid/actions/swap.pyx":31
- *         )
- *         cdef Agent *target = <Agent*>self.env._grid.object_at(target_loc)
+    /* "mettagrid/actions/swap.pyx":34
+ *         cdef MettaObject *target
+ *         target = <MettaObject*>self.env._grid.object_at(target_loc)
+ *         if target == NULL:             # <<<<<<<<<<<<<<
+ *             target_loc.layer = GridLayer.Object_Layer
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
+ */
+  }
+
+  /* "mettagrid/actions/swap.pyx":37
+ *             target_loc.layer = GridLayer.Object_Layer
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
  *         if target == NULL:             # <<<<<<<<<<<<<<
  *             return False
  * 
@@ -19830,38 +19867,38 @@ static int __pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action(struct __pyx_o
   __pyx_t_1 = (__pyx_v_target == NULL);
   if (__pyx_t_1) {
 
-    /* "mettagrid/actions/swap.pyx":32
- *         cdef Agent *target = <Agent*>self.env._grid.object_at(target_loc)
+    /* "mettagrid/actions/swap.pyx":38
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
  *         if target == NULL:
  *             return False             # <<<<<<<<<<<<<<
  * 
- *         if not target.frozen:
+ *         if not target.swappable():
  */
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "mettagrid/actions/swap.pyx":31
- *         )
- *         cdef Agent *target = <Agent*>self.env._grid.object_at(target_loc)
+    /* "mettagrid/actions/swap.pyx":37
+ *             target_loc.layer = GridLayer.Object_Layer
+ *             target = <MettaObject*>self.env._grid.object_at(target_loc)
  *         if target == NULL:             # <<<<<<<<<<<<<<
  *             return False
  * 
  */
   }
 
-  /* "mettagrid/actions/swap.pyx":34
+  /* "mettagrid/actions/swap.pyx":40
  *             return False
  * 
- *         if not target.frozen:             # <<<<<<<<<<<<<<
+ *         if not target.swappable():             # <<<<<<<<<<<<<<
  *             return False
  * 
  */
-  __pyx_t_1 = (!(__pyx_v_target->frozen != 0));
+  __pyx_t_1 = (!__pyx_v_target->swappable());
   if (__pyx_t_1) {
 
-    /* "mettagrid/actions/swap.pyx":35
+    /* "mettagrid/actions/swap.pyx":41
  * 
- *         if not target.frozen:
+ *         if not target.swappable():
  *             return False             # <<<<<<<<<<<<<<
  * 
  *         self.env._grid.swap_objects(actor.id, target.id)
@@ -19869,16 +19906,16 @@ static int __pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action(struct __pyx_o
     __pyx_r = 0;
     goto __pyx_L0;
 
-    /* "mettagrid/actions/swap.pyx":34
+    /* "mettagrid/actions/swap.pyx":40
  *             return False
  * 
- *         if not target.frozen:             # <<<<<<<<<<<<<<
+ *         if not target.swappable():             # <<<<<<<<<<<<<<
  *             return False
  * 
  */
   }
 
-  /* "mettagrid/actions/swap.pyx":37
+  /* "mettagrid/actions/swap.pyx":43
  *             return False
  * 
  *         self.env._grid.swap_objects(actor.id, target.id)             # <<<<<<<<<<<<<<
@@ -19886,7 +19923,7 @@ static int __pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action(struct __pyx_o
  */
   __pyx_v_self->__pyx_base.__pyx_base.env->_grid->swap_objects(__pyx_v_actor->id, __pyx_v_target->id);
 
-  /* "mettagrid/actions/swap.pyx":38
+  /* "mettagrid/actions/swap.pyx":44
  * 
  *         self.env._grid.swap_objects(actor.id, target.id)
  *         return True             # <<<<<<<<<<<<<<
@@ -19894,7 +19931,7 @@ static int __pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action(struct __pyx_o
   __pyx_r = 1;
   goto __pyx_L0;
 
-  /* "mettagrid/actions/swap.pyx":20
+  /* "mettagrid/actions/swap.pyx":22
  *         return 0
  * 
  *     cdef bint _handle_action(             # <<<<<<<<<<<<<<
@@ -21648,12 +21685,12 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_vtable_9mettagrid_7actions_4swap_Swap.__pyx_base.__pyx_base.max_arg = (unsigned char (*)(struct __pyx_obj_9mettagrid_6action_ActionHandler *))__pyx_f_9mettagrid_7actions_4swap_4Swap_max_arg;
   __pyx_vtable_9mettagrid_7actions_4swap_Swap.__pyx_base._handle_action = (int (*)(struct __pyx_obj_9mettagrid_7actions_7actions_MettaActionHandler *, unsigned int, Agent *, __pyx_t_9mettagrid_6action_ActionArg))__pyx_f_9mettagrid_7actions_4swap_4Swap__handle_action;
   #if CYTHON_USE_TYPE_SPECS
-  __pyx_t_2 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 13, __pyx_L1_error)
+  __pyx_t_2 = PyTuple_Pack(1, (PyObject *)__pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 15, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_ptype_9mettagrid_7actions_4swap_Swap = (PyTypeObject *) __Pyx_PyType_FromModuleAndSpec(__pyx_m, &__pyx_type_9mettagrid_7actions_4swap_Swap_spec, __pyx_t_2);
   __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
-  if (unlikely(!__pyx_ptype_9mettagrid_7actions_4swap_Swap)) __PYX_ERR(1, 13, __pyx_L1_error)
-  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_9mettagrid_7actions_4swap_Swap_spec, __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (unlikely(!__pyx_ptype_9mettagrid_7actions_4swap_Swap)) __PYX_ERR(1, 15, __pyx_L1_error)
+  if (__Pyx_fix_up_extension_type_from_spec(&__pyx_type_9mettagrid_7actions_4swap_Swap_spec, __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #else
   __pyx_ptype_9mettagrid_7actions_4swap_Swap = &__pyx_type_9mettagrid_7actions_4swap_Swap;
   #endif
@@ -21662,7 +21699,7 @@ static int __Pyx_modinit_type_init_code(void) {
   __pyx_ptype_9mettagrid_7actions_4swap_Swap->tp_base = __pyx_ptype_9mettagrid_7actions_7actions_MettaActionHandler;
   #endif
   #if !CYTHON_USE_TYPE_SPECS
-  if (__Pyx_PyType_Ready(__pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (__Pyx_PyType_Ready(__pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #endif
   #if PY_MAJOR_VERSION < 3
   __pyx_ptype_9mettagrid_7actions_4swap_Swap->tp_print = 0;
@@ -21672,13 +21709,13 @@ static int __Pyx_modinit_type_init_code(void) {
     __pyx_ptype_9mettagrid_7actions_4swap_Swap->tp_getattro = __Pyx_PyObject_GenericGetAttr;
   }
   #endif
-  if (__Pyx_SetVtable(__pyx_ptype_9mettagrid_7actions_4swap_Swap, __pyx_vtabptr_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (__Pyx_SetVtable(__pyx_ptype_9mettagrid_7actions_4swap_Swap, __pyx_vtabptr_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_MergeVtables(__pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (__Pyx_MergeVtables(__pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #endif
-  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Swap, (PyObject *) __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Swap, (PyObject *) __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #if !CYTHON_COMPILING_IN_LIMITED_API
-  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 13, __pyx_L1_error)
+  if (__Pyx_setup_reduce((PyObject *) __pyx_ptype_9mettagrid_7actions_4swap_Swap) < 0) __PYX_ERR(1, 15, __pyx_L1_error)
   #endif
   __pyx_vtabptr_array = &__pyx_vtable_array;
   __pyx_vtable_array.get_memview = (PyObject *(*)(struct __pyx_array_obj *))__pyx_array_get_memview;