fuck man major readjustment but it is running again...

This commit is contained in:
2023-06-28 19:40:42 +02:00
parent b7dc7b99d1
commit 509c59bb88
25 changed files with 353 additions and 147 deletions

View File

@@ -5,7 +5,7 @@ class AutoProductionAgent(BaseAgent):
"""
def __init__(self,sim,business,worker=1,employment_rate=0) -> None:
def __init__(self,sim,business,worker=-1,employment_rate=0) -> None:
super().__init__(sim)
self.business=business
self.prod=business.production
@@ -13,32 +13,56 @@ class AutoProductionAgent(BaseAgent):
self.employment_rate=employment_rate
self.employment_index=worker
self.target=0
self.prod_counter=0
def set_worker(self,workers):
if workers>1:
self.worker=workers
elif workers==-1:
self.worker=-1
else:
self.worker=1
def set_target(self,qty):
self.target=qty
def can_produce(self):
# If can produce item
for com in self.prod["prod"]:
for k,v in com.items():
if v > self.business.inventory[k]:
return False
# how much can we produce
minprod=[]
for k,v in self.prod["prod"].items():
minprod.append(self.business.inventory[k]/v)
possibleProds=int(min(minprod))
return possibleProds*self.prod["amount"]
def should_produce(self):
# check if we should produce
if self.business.resource_in_possesion()>self.target:
return False
return True
if self.business.resource_in_possesion()>=self.target:
return 0
return self.can_produce()
def tick(self,step,epi):
for i in range(self.worker):
if not self.can_produce():
continue
can=self.should_produce()
if can==0:
return
run=True
i=self.worker
while run:
if self.should_produce()==0:
return
if i==0:
return
# remove cost from inventory
for com in self.prod["prod"]:
for k,cost in com.items():
self.business.inventory[k]-=cost
for k,cost in self.prod["prod"].items():
self.business.inventory[k]-=cost
# add commodity
self.business.inventory[self.prod['name']]+=self.prod["amount"]
self.prod_counter+=1
i-=1
def reset_qty(self):
self.prod_counter=0
def qty(self):
return self.prod_counter

View File

@@ -17,6 +17,9 @@ class Base_Aquire_Agent(BaseAgent,ABC):
self.orders={i: {} for i in range(len(self.exchanges))}
self.target=0
self.trades=[]
self.tqty=0
self.qty_offset=0
self.expense=0
self.max_price=-1
super().__init__(simulation)
@@ -57,10 +60,11 @@ class Base_Aquire_Agent(BaseAgent,ABC):
return None # we dont have enough balance
self.business.balance-=total_price
self.expense+=total_price
cx.add_to_account(self.id,"balance",total_price) # prepaid charge account for cx
order=cx.submit_order(self.id,self.resource,amount,price_per,Side.BUY)
if order==None: # Order failed
return False
return None
self.orders[cx_id][order.order_id]=order
self.update_trades()
return order
@@ -73,6 +77,7 @@ class Base_Aquire_Agent(BaseAgent,ABC):
amount=cx.get_account_resource_amount(self.id,"balance")
cx.remove_from_account(self.id,"balance",amount)
self.business.balance+=amount
self.expense-=amount
def collect_resource_from_cxs(self,resource):
"""
@@ -88,13 +93,33 @@ class Base_Aquire_Agent(BaseAgent,ABC):
Returns a list of all trades performed by this agent
"""
trades=[]
self.tqty=0
for cx_id in range(len(self.exchanges)):
cx=self.exchanges[cx_id]
orders=self.orders[cx_id]
if len(orders)>0:
for k,o in orders.items():
if k in cx.order_trades_map:
trades.append(cx.order_trades_map[k])
trades.extend(cx.order_trades_map[k])
self.trades=trades
for t in trades:
self.tqty+=t.trade_qty
return trades
# Confirm a purchase of x amount to reduce qty and expense counter
def confirm_purchase(self,confirmed_qty):
expensePer=self.expense/self.qty
confirmedExpense=expensePer*confirmed_qty
self.expense-=confirmedExpense
self.qty_offset-=confirmed_qty
@property
def qty(self):
return self.tqty+self.qty_offset
def reset(self, episode):
#self.tqty=0
self.qty_offset=0
self.trades=[]
return super().reset(episode)

View File

@@ -2,6 +2,7 @@ from .base_agent import BaseAgent
from ..exchange import Exchange
from lightmatchingengine.lightmatchingengine import Order,Side
from abc import ABC
from decimal import *
class Base_Distribution_Agent(BaseAgent,ABC):
def __init__(self,simulation,business,resource,exchanges: list) -> None:
@@ -18,6 +19,10 @@ class Base_Distribution_Agent(BaseAgent,ABC):
self.target=0
self.min_price=-1
self.max_batch_qty=10
self.tincome=0
self.tqty=0
self.income_offset=0
self.qty_offset=0
super().__init__(simulation)
def set_target(self,target: int):
@@ -57,6 +62,7 @@ class Base_Distribution_Agent(BaseAgent,ABC):
return False # we dont have enough balance
self.business.inventory[self.resource]-=amount
cx.add_to_account(self.id,self.resource,amount) # prepaid charge account for cx
order=cx.submit_order(self.id,self.resource,amount,price_per,Side.SELL)
if order==None: # Order failed
@@ -72,6 +78,7 @@ class Base_Distribution_Agent(BaseAgent,ABC):
amount=cx.get_account_resource_amount(self.id,"balance")
cx.remove_from_account(self.id,"balance",amount)
self.business.balance+=amount
def collect_resource_from_cxs(self,resource):
"""
@@ -87,16 +94,37 @@ class Base_Distribution_Agent(BaseAgent,ABC):
Returns a list of all trades performed by this agent
"""
trades=[]
self.tqty=0
self.tincome=0
for cx_id in range(len(self.exchanges)):
cx=self.exchanges[cx_id]
orders=self.orders[cx_id]
if len(orders)>0:
for k,o in orders.items():
if k in cx.order_trades_map:
trades.append(cx.order_trades_map[k])
trades.extend(cx.order_trades_map[k])
self.trades=trades
for t in trades:
self.tqty+=t.trade_qty
self.tincome+=t.trade_qty*t.trade_price
self.tincome=round(self.tincome,2)
return trades
@property
def qty(self):
return self.tqty+self.qty_offset
@property
def income(self):
return self.tincome+self.income_offset
def confirm_distribution(self,dis_qty,step):
income_per=self.income/self.qty
income_to_confirm=income_per*dis_qty
self.income_offset-=income_to_confirm
self.qty_offset-=dis_qty
self.income_offset=round(self.income_offset,2)
def reset(self, episode):
self.qty_offset=0
self.income_offset=0
self.trades=[]
return super().reset(episode)

View File

@@ -51,7 +51,10 @@ class Price_Believe_Aquire_Agent(Base_Aquire_Agent):
self.open_orders[cx_id].append({
'id': order.order_id,
'lifetime': self.max_price_adj_rate,
'leaves': order.leaves_qty
})
if order.leaves_qty!=order.qty:
self.update_trades()
def tick_open_orders(self) -> int:
"""
@@ -65,18 +68,27 @@ class Price_Believe_Aquire_Agent(Base_Aquire_Agent):
for i in cx_orders:
# Check for each order if it is fullfiled or if it is timed
o=self.orders[cx_id][i["id"]]
leaves=o.leaves_qty
if o.leaves_qty==0:
#order is done
self.open_orders[cx_id].remove(i) # remove order from open
self.update_believe(cx_id,-1) # update price believe
self.collect_balance_from_cxs()
self.collect_resource_from_cxs(self.resource)
continue
if not (i["leaves"]==leaves):
#update in order
i["leaves"]=leaves
self.update_trades()
#reset lifetime
i["lifetime"]=self.max_price_adj_rate
if i["lifetime"]>0:
self.open_qty+=o.leaves_qty
i["lifetime"]-=1 # subtract lifetime
else:
# timeout
self.update_trades()
cx.cancel_order(i["id"])
self.collect_balance_from_cxs()
self.collect_resource_from_cxs(self.resource)

View File

@@ -1,107 +1,123 @@
from .base_distribution_agent import Base_Distribution_Agent
import random
class Price_Believe_Distribiute_Agent(Base_Distribution_Agent):
"""
Aquire agent with internal price believe system.
"""
def __init__(self, simulation, business, resource, exchanges: list, lr, max_price_adj_rate) -> None:
super().__init__(simulation, business, resource, exchanges)
self.lr=lr
self.max_price_adj_rate=max_price_adj_rate
self.price_believe={i: 1 for i in range(len(self.exchanges))}
self.open_orders={i: [] for i in range(len(self.exchanges))}
self.open_qty=0
self.lr = lr
self.max_price_adj_rate = max_price_adj_rate
self.price_believe = {i: 1 for i in range(len(self.exchanges))}
self.open_orders = {i: [] for i in range(len(self.exchanges))}
self.open_qty = 0
def tick(self, step, episode):
def tick(self,step,episode):
order_error=self.target_error()
if order_error>0:
order_error = self.target_error()
if order_error > 0:
# aquire based on current price belive
cx_id=self.select_best_cx()
order=self.distribute_resource(self.price_believe[cx_id],order_error,cx_id)
self.register_order(cx_id,order)
self.tick_open_orders()
cx_id = self.select_best_cx()
price=round(self.price_believe[cx_id])
if price<self.min_price:
price=self.min_price
order = self.distribute_resource(
price, order_error, cx_id)
self.register_order(cx_id, order)
self.tick_open_orders()
def select_best_cx(self):
best_id=-1
best=-1
best_id = -1
best = -1
for cx_id in range(len(self.exchanges)):
cx=self.exchanges[cx_id]
available=(cx.get_total_demand(self.resource)>0)
cx = self.exchanges[cx_id]
available = (cx.get_total_demand(self.resource) > 0)
if available:
potential=1*self.price_believe[cx_id]
potential = 1*self.price_believe[cx_id]
else:
continue
if potential>best:
best=potential
best_id=cx_id
if best_id==-1:
best_id=random.randint(0,len(self.exchanges)-1)
if potential > best:
best = potential
best_id = cx_id
if best_id == -1:
best_id = random.randint(0, len(self.exchanges)-1)
return best_id
def register_order(self,cx_id,order):
def register_order(self, cx_id, order):
self.open_orders[cx_id].append({
'id': order.order_id,
'lifetime': self.max_price_adj_rate,
'leaves': order.leaves_qty
})
if order.leaves_qty!=order.qty:
self.update_trades()
def tick_open_orders(self) -> int:
"""
Removes 1 from pending orders timeout timer and cancels timeed out orders.
Returns ids of orders that timeed out.
"""
self.open_qty=0
self.open_qty = 0
for cx_id in range(len(self.exchanges)):
cx=self.exchanges[cx_id]
cx_orders=self.open_orders[cx_id]
cx = self.exchanges[cx_id]
cx_orders = self.open_orders[cx_id]
for i in cx_orders:
# Check for each order if it is fullfiled or if it is timed
o=self.orders[cx_id][i["id"]]
if o.leaves_qty==0:
#order is done
# Check for each order if it is fullfiled or if it is timed
o = self.orders[cx_id][i["id"]]
leaves=o.leaves_qty
if o.leaves_qty == 0:
# order is done
self.open_orders[cx_id].remove(i) # remove order from open
self.update_believe(cx_id,1) # update price believe
self.update_believe(cx_id, 1) # update price believe
self.collect_balance_from_cxs()
self.collect_resource_from_cxs(self.resource)
self.update_trades()
continue
if i["lifetime"]>0:
self.open_qty+=o.leaves_qty
i["lifetime"]-=1 # subtract lifetime
if not (i["leaves"]==leaves):
#update in order
i["leaves"]=leaves
self.update_trades()
#reset lifetime
i["lifetime"]=self.max_price_adj_rate
if i["lifetime"] > 0:
self.open_qty += o.leaves_qty
i["lifetime"] -= 1 # subtract lifetime
else:
# timeout
self.update_trades()
cx.cancel_order(i["id"])
self.collect_balance_from_cxs()
self.collect_resource_from_cxs(self.resource)
self.update_believe(cx_id,-1)
self.update_believe(cx_id, -1)
self.open_orders[cx_id].remove(i)
def update_believe(self,cx_id,modifier):
def update_believe(self, cx_id, modifier):
"""
Updates the believe based on the modifier.
If positive will add lr to believe
If negative will sub lr to believe
"""
self.price_believe[cx_id]+=modifier*self.lr
if self.price_believe[cx_id]<0:
self.price_believe[cx_id]=0
def reset(self,episode):
self.price_believe[cx_id] += modifier*self.lr
if self.price_believe[cx_id] < 1:
self.price_believe[cx_id] = 1
def reset(self, episode):
# Clean shop for today
for cx_id in range(len(self.exchanges)):
cx=self.exchanges[cx_id]
cx_orders=self.open_orders[cx_id]
cx = self.exchanges[cx_id]
cx_orders = self.open_orders[cx_id]
for i in cx_orders:
cx.cancel_order(i["id"])
self.collect_balance_from_cxs()
self.collect_resource_from_cxs(self.resource)
# book keeping
self.update_trades()
self.open_orders={i: [] for i in range(len(self.exchanges))}
self.orders={i: {} for i in range(len(self.exchanges))}
return super().reset(episode)
self.open_orders = {i: [] for i in range(len(self.exchanges))}
self.orders = {i: {} for i in range(len(self.exchanges))}
return super().reset(episode)