From da5b2321d5a7c7ed0a8de2c22bc42a6301f219af Mon Sep 17 00:00:00 2001 From: andreabertolini1995 Date: Thu, 12 Aug 2021 16:43:03 +0200 Subject: [PATCH] Removed the "round" function in the assets' strategies, which could cause bids and offers not to trade --- d3a_api_client/setups/asset_api_template.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/d3a_api_client/setups/asset_api_template.py b/d3a_api_client/setups/asset_api_template.py index 33f31a8a..e6099140 100644 --- a/d3a_api_client/setups/asset_api_template.py +++ b/d3a_api_client/setups/asset_api_template.py @@ -113,12 +113,12 @@ def on_market_cycle(self, market_info): load_strategy = [] for i in range(0, ticks): if i < ticks - 2: - load_strategy.append(round( + load_strategy.append( FiT_rate - self.asset_strategy[area_uuid]["fee_to_market_maker"] + - (Market_Maker_rate + 2*self.asset_strategy[area_uuid]["fee_to_market_maker"] - FiT_rate) * (i / ticks), 3)) + (Market_Maker_rate + 2*self.asset_strategy[area_uuid]["fee_to_market_maker"] - FiT_rate) * (i / ticks)) else: - load_strategy.append(round( - Market_Maker_rate + self.asset_strategy[area_uuid]["fee_to_market_maker"], 3)) + load_strategy.append( + Market_Maker_rate + self.asset_strategy[area_uuid]["fee_to_market_maker"]) self.asset_strategy[area_uuid]["buy_rates"] = load_strategy # Generation strategy @@ -126,10 +126,10 @@ def on_market_cycle(self, market_info): gen_strategy = [] for i in range(0, ticks): if i < ticks - 2: - gen_strategy.append(round(max(0, Market_Maker_rate + self.asset_strategy[area_uuid]["fee_to_market_maker"] - - (Market_Maker_rate + 2*self.asset_strategy[area_uuid]["fee_to_market_maker"] - FiT_rate) * (i / ticks)), 3)) + gen_strategy.append(max(0, Market_Maker_rate + self.asset_strategy[area_uuid]["fee_to_market_maker"] - + (Market_Maker_rate + 2*self.asset_strategy[area_uuid]["fee_to_market_maker"] - FiT_rate) * (i / ticks))) else: - gen_strategy.append(round(max(0, FiT_rate - self.asset_strategy[area_uuid]["fee_to_market_maker"]), 3)) + gen_strategy.append(max(0, FiT_rate - self.asset_strategy[area_uuid]["fee_to_market_maker"])) self.asset_strategy[area_uuid]["sell_rates"] = gen_strategy # Storage strategy @@ -137,8 +137,8 @@ def on_market_cycle(self, market_info): batt_buy_strategy = [] batt_sell_strategy = [] for i in range(0, ticks): - batt_buy_strategy.append(round(FiT_rate - self.asset_strategy[area_uuid]["fee_to_market_maker"] + (Med_price - (FiT_rate-self.asset_strategy[area_uuid]["fee_to_market_maker"])) * (i / ticks), 3)) - batt_sell_strategy.append(round(Market_Maker_rate+self.asset_strategy[area_uuid]["fee_to_market_maker"] - (Market_Maker_rate+self.asset_strategy[area_uuid]["fee_to_market_maker"] - Med_price) * (i / ticks), 3)) + batt_buy_strategy.append(FiT_rate - self.asset_strategy[area_uuid]["fee_to_market_maker"] + (Med_price - (FiT_rate-self.asset_strategy[area_uuid]["fee_to_market_maker"])) * (i / ticks)) + batt_sell_strategy.append(Market_Maker_rate+self.asset_strategy[area_uuid]["fee_to_market_maker"] - (Market_Maker_rate+self.asset_strategy[area_uuid]["fee_to_market_maker"] - Med_price) * (i / ticks)) self.asset_strategy[area_uuid]["buy_rates"] = batt_buy_strategy self.asset_strategy[area_uuid]["sell_rates"] = batt_sell_strategy