seams to start working

econ/exchange.py

@@ -33,6 +33,7 @@ class Exchange():
         self.demand={}
         self.total_supply={}
         self.supply={}
+        self.traded_commoditys={}
     
     def add_to_account(self,account_id,resource,amount):
         """
@@ -241,6 +242,7 @@ class Exchange():
    
         self.best_ask[resource]=best_ask
         self.best_bid[resource]=best_bid
+        self.traded_commoditys[resource]=True
 
     def get_account_resource_amount(self,account_id,resource):
         """
@@ -260,25 +262,23 @@ class Exchange():
             return self.total_supply[resource]
         return 0
     
-    def log_step(self,name,episode,episode_length,step):
+    def log_step(self,name,episode,episode_length,step,autolog=True):
         timepoint=episode*episode_length+step
         localStepDB={}
-        data={}
-        data["cxid"]=name
-        data["episode"]=episode
-        data["step"]=step
-        data["tstep"]=timepoint
-        data["instrm"]="None"
-        data["best_ask"]=-1
-        data["best_bid"]=-1
-        data["total_demand"]=-1
-        data["total_supply"]=-1
-        data["market_rate"]=-1
 
-        for id,order in self.orders.items():
-            t=data.copy()
-            t["instrm"]=order.instmt
-            localStepDB[order.instmt]=t
+        for instrm,order in self.traded_commoditys.items():
+            data={}
+            data["cxid"]=name
+            data["episode"]=episode
+            data["step"]=step
+            data["tstep"]=timepoint
+            data["instrm"]=instrm
+            data["best_ask"]=0
+            data["best_bid"]=0
+            data["total_demand"]=0
+            data["total_supply"]=0
+            data["market_rate"]=0
+            localStepDB[instrm]=data
     
         ## add best ask/best bid
         for item , value in self.best_ask.items():
@@ -299,9 +299,10 @@ class Exchange():
             if value!=None:
                 localStepDB[item]["market_rate"]=value
 
-        for id,item in localStepDB.items():
-            log.EXBooksData.append(item)
-        return data
+        if autolog:
+            for id,item in localStepDB.items():
+                log.EXBooksData.append(item)
+        return localStepDB
     
     def log_episode(self,name,episode):
         for t in self.executed_trades: