From 567407c8177bba0ba278b2f30e5f4409c559b4ad Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Thu, 20 Apr 2023 16:17:08 +0200
Subject: [PATCH] zakomentovana slopeMA

---
 v2realbot/ENTRY_backtest_strategyVykladaci.py |  27 ++++++++++++++++--
 v2realbot/__pycache__/config.cpython-310.pyc  | Bin 2590 -> 2590 bytes
 v2realbot/config.py                           |   2 +-
 v2realbot/static/js/mywebsocket.js            |   2 +-
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/v2realbot/ENTRY_backtest_strategyVykladaci.py b/v2realbot/ENTRY_backtest_strategyVykladaci.py
index 7bf6873..151b356 100644
--- a/v2realbot/ENTRY_backtest_strategyVykladaci.py
+++ b/v2realbot/ENTRY_backtest_strategyVykladaci.py
@@ -197,6 +197,17 @@ def next(data, state: StrategyState):
             #state.indicators.roc.append(roc)
             #print("slope", state.indicators.slope[-5:])
             state.ilog(e="Slope "+str(slope), msg="lookback price:"+str(lookbackprice), lookbackoffset=lookback_offset, minimum_slope=minimum_slope, last_slopes=state.indicators.slope[-10:])
+
+
+            #slope MA - cílem je identifikovat táhlá klesání, vypnout nákupy, až budou zase růsty
+            # slope_MA_length = 150
+            # state.indicators.slopeMA = ema(state.indicators.slope, slope_MA_length) #state.bars.vwap
+            # #TODO - docasne posilam cele MA
+            # try:
+            #     state.ilog(e="Slope - MA"+str(state.indicators.slopeMA[-1]), slopeMA=str(state.indicators.slopeMA[-20:]))
+            # except Exception as e:
+            #     state.ilog(e="Slope - MA"+str(state.indicators.slopeMA[-1]))
+
         else:
             state.ilog(e="Slope - not enough data", slope_lookback=slope_lookback)
 
@@ -286,9 +297,20 @@ def next(data, state: StrategyState):
     lp = state.interface.get_last_price(symbol=state.symbol)
     state.ilog(e="ENTRY", msg="AVGP:"+str(state.avgp)+ "POS:" +str(state.positions), last_price=lp, stratvars=state.vars)
 
-    #SLOPE ANGLE PROTECTION
-    if slope < minimum_slope:
+
+    #maxSlopeMA = -0.03
+    #SLOPE ANGLE PROTECTIONs
+    #slope zachycuje rychle sestupy
+    #slopeMA zachycuje táhlé sestupy
+    # try:
+    #   slopeMA = state.indicators.slopeMA[-1]
+    # except Exception as e:
+    #     slopeMA = 99
+
+    if slope < minimum_slope: # or slopeMA<maxSlopeMA:
         print("OCHRANA SLOPE TOO HIGH")
+        # if slopeMA<maxSlopeMA:
+        #     state.ilog(e="Slope MA too high "+str(slopeMA)+" max:"+str(maxSlopeMA))
         state.ilog(e="Slope too high "+str(slope))
         if len(state.vars.pendingbuys)>0:
             print("CANCEL PENDINGBUYS")
@@ -378,6 +400,7 @@ def init(state: StrategyState):
     print("INIT v main",state.name)
     state.indicators['ema'] = []
     state.indicators['slope'] = []
+    #state.indicators['slopeMA'] = []
     #static indicators - those not series based
     state.statinds['angle'] = {}
     state.vars["ticks2reset_backup"] = state.vars.ticks2reset
diff --git a/v2realbot/__pycache__/config.cpython-310.pyc b/v2realbot/__pycache__/config.cpython-310.pyc
index 56838a3a7cbb93a0b17ea521007eec2a6f9d1179..29d633f6b1ad6f2a60dfe787c648bf5540c8e675 100644
GIT binary patch
delta 19
ZcmbOyGEamnpO=@50SKmgY~&K*0stvU1GoSH

delta 19
ZcmbOyGEamnpO=@50SJB>ZR8T+0st#G1P1^B

diff --git a/v2realbot/config.py b/v2realbot/config.py
index 444b718..b6ec2f7 100644
--- a/v2realbot/config.py
+++ b/v2realbot/config.py
@@ -2,7 +2,7 @@ from alpaca.data.enums import DataFeed
 from v2realbot.enums.enums import Mode, Account
 from appdirs import user_data_dir
 
-QUIET_MODE = True
+QUIET_MODE = False
 COUNT_API_REQUESTS = False
 STRATVARS_UNCHANGEABLES = ['pendingbuys', 'blockbuy', 'jevylozeno', 'limitka']
 DATA_DIR = user_data_dir("v2realbot")
diff --git a/v2realbot/static/js/mywebsocket.js b/v2realbot/static/js/mywebsocket.js
index 83c1435..1c8d7ba 100644
--- a/v2realbot/static/js/mywebsocket.js
+++ b/v2realbot/static/js/mywebsocket.js
@@ -1,4 +1,4 @@
-const momentumIndicatorNames = ["roc", "slope"]
+const momentumIndicatorNames = ["roc", "slope", "slopeMA"]
 var indList = []
 var pbiList = []
 var ws = null;