reading fucking cells

econ/agents/autoproduction.py

@@ -5,12 +5,19 @@ class AutoProductionAgent(BaseAgent):
     """    
 
 
-    def __init__(self,sim,business) -> None:
+    def __init__(self,sim,business,worker=1,employment_rate=0) -> None:
         super().__init__(sim)
         self.business=business
         self.prod=business.production
+        self.worker=worker
+        self.employment_rate=employment_rate
+        self.employment_index=worker
 
-
+    def set_worker(self,workers):
+        if workers>1:
+            self.worker=workers
+        else:
+            self.worker=1
 
     def can_produce(self):
         # If can produce item
@@ -19,11 +26,15 @@ class AutoProductionAgent(BaseAgent):
                 return False
         return True
         
-    def tick(self):
-        if not self.can_produce():
-            return
-        # remove cost from inventory
-        for k,cost in self.prod["craft"].items():
-            self.business.inventory[k]-=cost
-        # add commodity
-        self.business.inventory[self.prod['name']]+=self.prod["amount"]
+    def tick(self,step,epi):
+        for i in range(self.worker):
+            if not self.can_produce():
+                self.employment_index-=self.employment_rate
+                continue
+            self.employment_index+=self.employment_rate
+            self.set_worker(int(self.employment_index))
+            # remove cost from inventory
+            for k,cost in self.prod["craft"].items():
+                self.business.inventory[k]-=cost
+            # add commodity
+            self.business.inventory[self.prod['name']]+=self.prod["amount"]

econ/agents/base_agent.py

@@ -9,9 +9,18 @@ class BaseAgent(ABC):
         """
         self.id=uuid.uuid4()
         self.simulation=simulation
-        simulation.register_tick(self.id,self.tick)
+        simulation.register_agent(self.id,self.tick,self.reset)
         pass
-    def tick(self):
+    def tick(self,tick,episode):
         """
         Tick method for simulation to call to execute selected action
-        """
+        """
+        assert "No Tick method has been provided"
+    pass
+
+    def reset(self):
+        """
+        Resets agent to new episode.
+        """
+        assert "No reset method has been provided"
+    pass

econ/agents/base_aquire_agent.py

@@ -16,6 +16,7 @@ class Base_Aquire_Agent(BaseAgent,ABC):
         self.exchanges=exchanges
         self.orders={i: {} for i in range(len(self.exchanges))}
         self.target=0
+        self.trades=[]
         self.max_price=-1
         super().__init__(simulation)
     
@@ -61,7 +62,7 @@ class Base_Aquire_Agent(BaseAgent,ABC):
         if order==None: # Order failed
             return False
         self.orders[cx_id][order.order_id]=order
-        
+        self.update_trades()
         return order
     
     def collect_balance_from_cxs(self):

econ/agents/price_believe_aquire.py

@@ -8,26 +8,39 @@ class Price_Believe_Aquire_Agent(Base_Aquire_Agent):
         super().__init__(simulation, business, resource, exchanges)
         self.lr=lr
         self.max_price_adj_rate=max_price_adj_rate
-        self.price_believe=-1
+        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):
+    def tick(self,tick,episode):
         if self.price_believe==-1:
             self.price_believe=self.max_price
         
         order_error=self.open_qty+self.target_error()
         if order_error<0:
             # aquire based on current price belive
-            order=self.order_resource(self.price_believe,order_error*-1,0)
+            cx_id=self.select_best_cx()
+            order=self.order_resource(self.price_believe[cx_id],order_error*-1,cx_id)
             if not order==None:
                 self.register_order(0,order)
             else:
-                # order failed .. we need to adjust our price believe
-                self.update_believe(-1)
+                # order failed due to missing balance.. we need to adjust our price believe
+                self.collect_balance_from_cxs()
+                self.collect_resource_from_cxs(self.resource)
+                self.update_believe(cx_id,-1)
         self.tick_open_orders()    
 
-    
+    def select_best_cx(self):
+        best_id=0
+        best=0
+        for cx_id in range(len(self.exchanges)):
+            cx=self.exchanges[cx_id]
+            potential=cx.total_supply[self.resource]*self.price_believe[cx_id]
+            if potential<best:
+                best=potential
+                best_id=cx_id
+        return best_id
         
     def register_order(self,cx_id,order):
         self.open_orders[cx_id].append({
@@ -61,19 +74,28 @@ class Price_Believe_Aquire_Agent(Base_Aquire_Agent):
                     # timeout
                     cx.cancel_order(i["id"])
                     self.collect_balance_from_cxs()
-                    self.collect_resource_from_cxs()
+                    self.collect_resource_from_cxs(self.resource)
                     self.update_believe(1)
                     self.open_orders[cx_id].remove(i)
-                    
 
-                    
-        
-
-
-    def update_believe(self,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+=modifier*self.lr
+        self.price_believe[cx_id]+=modifier*self.lr
+
+    def reset(self):
+        # Clean shop for today
+        for cx_id in range(len(self.exchanges)):
+            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()
+
+        return super().reset()

econ/agents/price_believe_distribute.py

@@ -19,11 +19,21 @@ class Price_Believe_Distribiute_Agent(Base_Distribution_Agent):
         order_error=self.target_error()
         if order_error>0:
             # aquire based on current price belive
-            order=self.distribute_resource(self.price_believe,order_error,0)
+            cx_id=self.select_best_cx()
+            order=self.distribute_resource(self.price_believe,order_error,cx_id)
             self.register_order(0,order)
         self.tick_open_orders()    
 
-    
+    def select_best_cx(self):
+        best_id=0
+        best=0
+        for cx_id in range(len(self.exchanges)):
+            cx=self.exchanges[cx_id]
+            potential=cx.total_supply[self.resource]*self.price_believe[cx_id]
+            if potential>best:
+                best=potential
+                best_id=cx_id
+        return best_id
         
     def register_order(self,cx_id,order):
         self.open_orders[cx_id].append({
@@ -66,10 +76,24 @@ class Price_Believe_Distribiute_Agent(Base_Distribution_Agent):
         
 
 
-    def update_believe(self,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+=modifier*self.lr
+        self.price_believe[cx_id]+=modifier*self.lr
+    
+    def reset(self):
+        # Clean shop for today
+        for cx_id in range(len(self.exchanges)):
+            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()
+
+        return super().reset()