made a bit of progress
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
from pymongo import MongoClient
|
||||
import datetime
|
||||
cmt="current_market_trades"
|
||||
cma="current_market_asks"
|
||||
cmb="current_market_bids"
|
||||
@@ -28,15 +29,17 @@ class MongoExporter():
|
||||
c=self.client
|
||||
market=self.econ.get_component("ContinuousDoubleAuction")
|
||||
self.reset_market()
|
||||
|
||||
base=datetime.datetime.fromtimestamp(0)
|
||||
delta=datetime.timedelta(days=1)
|
||||
for i in range(len(market.executed_trades)):
|
||||
step=market.executed_trades[i]
|
||||
timestep=base+(i*delta)
|
||||
if len(step)>0:
|
||||
for transaction in step:
|
||||
transaction["step"]=i
|
||||
c[cmt].insert_one(transaction)
|
||||
c[cma].insert_many(market.asks)
|
||||
c[cmb].insert_many(market.bids)
|
||||
#c[cma].insert_many(market.asks)
|
||||
# c[cmb].insert_many(market.bids)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ env_config = {
|
||||
# (3) Movement and resource collection
|
||||
('SimpleGather', {}),
|
||||
('ExternalMarket',{'market_demand':{
|
||||
'Gem': 15
|
||||
'Gem': 11
|
||||
}}),
|
||||
],
|
||||
|
||||
@@ -57,7 +57,7 @@ env_config = {
|
||||
|
||||
# ===== STANDARD ARGUMENTS ======
|
||||
# kwargs that are used by every Scenario class (i.e. defined in BaseEnvironment)
|
||||
'agent_composition': {"BasicMobileAgent": 20,"TradingAgent":5}, # Number of non-planner agents (must be > 1)
|
||||
'agent_composition': {"BasicMobileAgent": 10,"TradingAgent":10}, # Number of non-planner agents (must be > 1)
|
||||
'world_size': [5, 5], # [Height, Width] of the env world
|
||||
'episode_length': 256, # Number of timesteps per episode
|
||||
'isoelastic_eta':0.001,
|
||||
@@ -242,7 +242,7 @@ econ=foundation.make_env_instance(**env_config)
|
||||
|
||||
market=econ.get_component("ContinuousDoubleAuction")
|
||||
action=market.get_n_actions("TradingAgent")
|
||||
baseEconWrapper=BaseEconWrapper(econ)
|
||||
baseEconWrapper=BaseEconWrapper(econ,True)
|
||||
baseEconWrapper.run()
|
||||
time.sleep(0.5)
|
||||
mobileRecieverEconWrapper=RecieverEconWrapper(base_econ=baseEconWrapper,agent_classname="BasicMobileAgent")
|
||||
@@ -262,7 +262,7 @@ stackenv_traid=vec_frame_stack.VecFrameStack(venv=montraidingenv,n_stack=num_fra
|
||||
econ_eval=foundation.make_env_instance(**eval_env_config)
|
||||
|
||||
|
||||
baseEconWrapper_eval=BaseEconWrapper(econ_eval)
|
||||
baseEconWrapper_eval=BaseEconWrapper(econ_eval,False)
|
||||
baseEconWrapper_eval.run()
|
||||
time.sleep(0.5)
|
||||
mobileRecieverEconWrapper_eval=RecieverEconWrapper(base_econ=baseEconWrapper_eval,agent_classname="BasicMobileAgent")
|
||||
@@ -325,6 +325,7 @@ while True:
|
||||
|
||||
## Run Eval
|
||||
print("### EVAL ###")
|
||||
baseEconWrapper_eval.force_reset()
|
||||
obs_basic=stackenv_basic_eval.reset()
|
||||
obs_trade=stackenv_traid_eval.reset()
|
||||
done=False
|
||||
|
||||
@@ -58,7 +58,7 @@ env_config = {
|
||||
|
||||
# ===== STANDARD ARGUMENTS ======
|
||||
# kwargs that are used by every Scenario class (i.e. defined in BaseEnvironment)
|
||||
'agent_composition': {"BasicMobileAgent": 20,"TradingAgent":5}, # Number of non-planner agents (must be > 1)
|
||||
'agent_composition': {"BasicMobileAgent": 5,"TradingAgent":10}, # Number of non-planner agents (must be > 1)
|
||||
'world_size': [5, 5], # [Height, Width] of the env world
|
||||
'episode_length': 256, # Number of timesteps per episode
|
||||
'isoelastic_eta':0.001,
|
||||
@@ -186,7 +186,7 @@ def printReplay(econ,agentid):
|
||||
econ=foundation.make_env_instance(**env_config)
|
||||
market=econ.get_component("ContinuousDoubleAuction")
|
||||
action=market.get_n_actions("TradingAgent")
|
||||
baseEconWrapper=BaseEconWrapper(econ)
|
||||
baseEconWrapper=BaseEconWrapper(econ,False)
|
||||
baseEconWrapper.run()
|
||||
time.sleep(0.5)
|
||||
mobileRecieverEconWrapper=RecieverEconWrapper(base_econ=baseEconWrapper,agent_classname="BasicMobileAgent")
|
||||
@@ -229,6 +229,7 @@ exporter=MongoExporter(CONNECTION_STRING,"econ",econ)
|
||||
|
||||
while True:
|
||||
print("### EVAL ###")
|
||||
baseEconWrapper.force_reset()
|
||||
obs_basic=stackenv_basic.reset()
|
||||
obs_trade=stackenv_traid.reset()
|
||||
done=False
|
||||
@@ -254,7 +255,7 @@ while True:
|
||||
# trades=market.get_dense_log()
|
||||
build=craft.get_dense_log()
|
||||
met=econ.previous_episode_metrics
|
||||
printReplay(econ,21)
|
||||
printReplay(econ,5)
|
||||
#printMarket(trades)
|
||||
#printBuilds(builds=build)
|
||||
print("social/productivity: {}".format(met["social/productivity"]))
|
||||
|
||||
@@ -17,7 +17,7 @@ class BaseEconWrapper():
|
||||
info=None
|
||||
n_data_retrieved=0
|
||||
|
||||
def __init__(self, econ: base_env.BaseEnvironment):
|
||||
def __init__(self, econ: base_env.BaseEnvironment,auto_reset):
|
||||
self.env=econ
|
||||
self.vote_lock=Lock()
|
||||
|
||||
@@ -26,6 +26,8 @@ class BaseEconWrapper():
|
||||
self.action_edit_lock=Lock()
|
||||
self.stop_edit_lock=Lock()
|
||||
self.env_data_lock=Lock()
|
||||
self.auto_reset=auto_reset
|
||||
|
||||
|
||||
def register_vote(self):
|
||||
"""Register reciever on base. Returns ID of Voter to pass on during blocking"""
|
||||
@@ -79,7 +81,7 @@ class BaseEconWrapper():
|
||||
|
||||
#check for reset
|
||||
self.vote_lock.acquire() # we might edit votes
|
||||
if self.n_voters==self.n_votes_reset:
|
||||
if self.n_voters<=self.n_votes_reset:
|
||||
## perform reset
|
||||
self.n_votes_reset=0
|
||||
self._reset()
|
||||
@@ -96,6 +98,7 @@ class BaseEconWrapper():
|
||||
# release actions
|
||||
# we are done
|
||||
|
||||
|
||||
def stop_env(self):
|
||||
"""Stops the wrapper"""
|
||||
self.stop_edit_lock.acquire()
|
||||
@@ -110,13 +113,17 @@ class BaseEconWrapper():
|
||||
self.n_votes_reset=0
|
||||
self.obs=self.env.reset() #Reset env
|
||||
self.rew=None
|
||||
self.done=None
|
||||
self.done={'__all__': False}
|
||||
self.info=None
|
||||
self.env_data_lock.release() #Release lock
|
||||
# Notify for reset
|
||||
self.reset_notification.set()
|
||||
for v in self.step_notifications:
|
||||
v.clear() # unlock stepping
|
||||
def force_reset(self):
|
||||
"""Force a reset with no votes"""
|
||||
self._reset()
|
||||
#self.n_votes_reset=-self.n_voters
|
||||
|
||||
def _step(self):
|
||||
"""Steping interaly"""
|
||||
|
||||
@@ -21,6 +21,7 @@ class SB3EconConverter(VecEnv, gym.Env):
|
||||
obs0=utils.package(obs[0],*self.packager)
|
||||
obs0["flat"]
|
||||
self.step_request_send=False
|
||||
self.reset_request_send=False
|
||||
self.auto_reset=auto_reset
|
||||
self.observation_space=gym.spaces.Box(low=0,high=10,shape=(len(obs0["flat"]),),dtype=np.float32)
|
||||
super().__init__(self.num_envs, self.observation_space, self.action_space)
|
||||
@@ -73,7 +74,7 @@ class SB3EconConverter(VecEnv, gym.Env):
|
||||
|
||||
def reset(self) -> VecEnvObs:
|
||||
obs=self.env.reset()
|
||||
self.step_request_send=False
|
||||
|
||||
f_obs={}
|
||||
self.curr_obs=obs
|
||||
for k,v in obs.items():
|
||||
|
||||
Reference in New Issue
Block a user