cp

Author: daveey

packages/mettagrid/cpp/include/mettagrid/objects/agent.hpp

@@ -4,6 +4,7 @@
 #include <algorithm>
 #include <array>
 #include <cassert>
+#include <climits>
 #include <random>
 #include <string>
 #include <vector>
@@ -65,7 +66,7 @@ class Agent : public GridObject, public HasInventory, public Usable {
   // Implementation of Usable interface
   bool onUse(Agent& actor, ActionArg arg) override;
 
-  std::vector<PartialObservationToken> obs_features() const override;
+  std::vector<PartialObservationToken> obs_features(unsigned int observer_agent_id = UINT_MAX) const override;
 
   // Set observation encoder for inventory feature ID lookup
   void set_obs_encoder(const ObservationEncoder* encoder) {

packages/mettagrid/cpp/include/mettagrid/objects/assembler.hpp

@@ -499,7 +499,8 @@ class Assembler : public GridObject, public Usable {
     return true;
   }
 
-  virtual std::vector<PartialObservationToken> obs_features() const override {
+  virtual std::vector<PartialObservationToken> obs_features(
+      unsigned int /*observer_agent_id*/ = UINT_MAX) const override {
     std::vector<PartialObservationToken> features;
 
     unsigned int remaining = std::min(cooldown_remaining(), 255u);

packages/mettagrid/cpp/include/mettagrid/objects/chest.hpp

@@ -121,7 +121,8 @@ class Chest : public GridObject, public Usable, public HasInventory {
     return false;
   }
 
-  virtual std::vector<PartialObservationToken> obs_features() const override {
+  virtual std::vector<PartialObservationToken> obs_features(
+      unsigned int /*observer_agent_id*/ = UINT_MAX) const override {
     if (!this->obs_encoder) {
       throw std::runtime_error("Observation encoder not set for chest");
     }

packages/mettagrid/cpp/include/mettagrid/objects/wall.hpp

@@ -4,6 +4,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
+#include <climits>
 #include <string>
 #include <vector>
 
@@ -23,7 +24,7 @@ class Wall : public GridObject {
     GridObject::init(cfg, GridLocation(r, c));
   }
 
-  std::vector<PartialObservationToken> obs_features() const override {
+  std::vector<PartialObservationToken> obs_features(unsigned int /*observer_agent_id*/ = UINT_MAX) const override {
     std::vector<PartialObservationToken> features;
     features.reserve(1 + tag_ids.size() + (this->vibe != 0 ? 1 : 0));
 

packages/mettagrid/cpp/src/mettagrid/objects/agent.cpp

@@ -184,7 +184,7 @@ bool Agent::onUse(Agent& actor, ActionArg arg) {
   return false;
 }
 
-std::vector<PartialObservationToken> Agent::obs_features() const {
+std::vector<PartialObservationToken> Agent::obs_features(unsigned int /*observer_agent_id*/) const {
   if (!this->obs_encoder) {
     throw std::runtime_error("Observation encoder not set for agent");
   }