dwker/v2realbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix endmarket stop

Browse Source
This commit is contained in:
David Brazda
2023-12-01 23:59:43 +01:00
parent 0f0b816c7a
commit d38bf0600f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
v2realbot/strategy/base.py
View File

@ -434,8 +434,11 @@ class Strategy:
#check internal signals - for profit/loss optim etc - valid for runner #check internal signals - for profit/loss optim etc - valid for runner
if self.signal_stop: if self.signal_stop:
print(current_thread().name, "Stopping signal - internal") print(current_thread().name, "Stopping signal - internal")
break break
#check signals - stops also batch if self.state.time is not None and self.state.time > self.state.today_market_close:
print(current_thread().name, "MARKET CLOSE - Stopping signal - internal")
break
#check signals - external signal stops also batch
if self.se.is_set(): if self.se.is_set():
print(current_thread().name, "External stopping signal") print(current_thread().name, "External stopping signal")
break break
@ -728,7 +731,7 @@ class StrategyState:
self.rectype = rectype self.rectype = rectype
#LIVE - now() #LIVE - now()
#BACKTEST - allows the interface to realize past events #BACKTEST - allows the interface to realize past events
self.time = 0 self.time = None
#time of last trade processed #time of last trade processed
self.last_trade_time = 0 self.last_trade_time = 0
self.last_entry_price=dict(long=0,short=999) self.last_entry_price=dict(long=0,short=999)
@ -789,6 +792,7 @@ class StrategyState:
self.extData = defaultdict(dict) self.extData = defaultdict(dict)
self.mode = None self.mode = None
self.wait_for_fill = None self.wait_for_fill = None
self.today_market_close = None
def release(self): def release(self):
#release large variables #release large variables