steffen/marl-factory-grid
1
0
Fork 0
mirror of https://github.com/illiumst/marl-factory-grid.git synced 2025-05-23 07:16:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

added regex search for bound entitiy search

Browse Source
This commit is contained in:
Chanumask 2023-10-30 15:03:18 +01:00
parent 00391d2bec
commit ea6634b187
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
marl_factory_grid/utils/helpers.py
View File

@ -239,7 +239,7 @@ def add_bound_name(name_str, bound_e):
def add_pos_name(name_str, bound_e):
if bound_e.var_has_pos:
if bound_e.var_has_position:
return f'{name_str}({bound_e.pos})'
return name_str

10
marl_factory_grid/utils/observation_builder.py
View File

@ -1,4 +1,5 @@
import math
import re
from collections import defaultdict
from itertools import product
from typing import Dict, List
@ -120,10 +121,13 @@ class OBSBuilder(object):
except KeyError:
try:
# Look for bound entity names!
e = self.all_obs[h.add_bound_name(l_name, agent)]
pattern = re.compile(f'{re.escape(l_name)}(.*){re.escape(agent.name)}')
print(pattern)
name = next((x for x in self.all_obs if pattern.search(x)), None)
e = self.all_obs[name]
except KeyError:
try:
e = next(x for x in self.all_obs if l_name in x and agent.name in x)
e = next(v for k in self.all_obs.items() if l_name in k and agent.name in k)
except StopIteration:
raise KeyError(
f'Check for spelling errors! \n '
@ -146,8 +150,6 @@ class OBSBuilder(object):
try:
v = e.encoding
except AttributeError:
print(e)
print(e.var_has_position)
raise AttributeError(f'This env. expects Entity-Clases to report their "encoding"')
try:
np.put(obs[idx], range(len(v)), v, mode='raise')