From a02a7c288c116705ae7ba7765633201668bf9bbb Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 10 May 2022 14:36:32 +0300 Subject: [PATCH] cleanup --- market_trade/core/CoreDraw.py | 2 +- market_trade/core/Ind_ADX.py | 8 ++-- market_trade/core/Ind_Alligator.py | 6 +-- market_trade/core/Ind_DonchianChannel.py | 6 +-- market_trade/core/Ind_Envelopes.py | 6 +-- market_trade/core/Ind_Gator.py | 8 ++-- market_trade/core/Ind_Ishimoku.py | 4 +- market_trade/core/Ind_LRI.py | 6 +-- market_trade/core/Ind_STD.py | 6 +-- market_trade/core/Ind_Stochastic.py | 6 +-- market_trade/core/Ind_bollingerBands.py | 6 +-- .../signals/{Signal_1.py => Signal1.py} | 12 +++--- tools/test_signal.py | 37 +++++++++++++++++++ 13 files changed, 75 insertions(+), 38 deletions(-) rename market_trade/signals/{Signal_1.py => Signal1.py} (92%) create mode 100644 tools/test_signal.py diff --git a/market_trade/core/CoreDraw.py b/market_trade/core/CoreDraw.py index eac5811..f7b81ed 100644 --- a/market_trade/core/CoreDraw.py +++ b/market_trade/core/CoreDraw.py @@ -25,7 +25,7 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath +import market_trade.core.CoreTraidMath import plotly.express as px diff --git a/market_trade/core/Ind_ADX.py b/market_trade/core/Ind_ADX.py index 40eb089..6afd4d9 100644 --- a/market_trade/core/Ind_ADX.py +++ b/market_trade/core/Ind_ADX.py @@ -25,8 +25,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw init_notebook_mode() class ADXI: @@ -165,8 +165,8 @@ class ADXI: - ans = CoreDraw.coreDraw(req,drawFig) - + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) + return ans diff --git a/market_trade/core/Ind_Alligator.py b/market_trade/core/Ind_Alligator.py index c3e9cf1..426a0a2 100644 --- a/market_trade/core/Ind_Alligator.py +++ b/market_trade/core/Ind_Alligator.py @@ -24,8 +24,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class Alligator: @@ -110,5 +110,5 @@ class Alligator: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_DonchianChannel.py b/market_trade/core/Ind_DonchianChannel.py index 7a6748b..7eb1a4c 100644 --- a/market_trade/core/Ind_DonchianChannel.py +++ b/market_trade/core/Ind_DonchianChannel.py @@ -24,8 +24,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw @@ -104,5 +104,5 @@ class IDC: self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_Envelopes.py b/market_trade/core/Ind_Envelopes.py index 6fec035..d452155 100644 --- a/market_trade/core/Ind_Envelopes.py +++ b/market_trade/core/Ind_Envelopes.py @@ -24,8 +24,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class Envelopes: @@ -120,5 +120,5 @@ class Envelopes: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_Gator.py b/market_trade/core/Ind_Gator.py index f831824..0814027 100644 --- a/market_trade/core/Ind_Gator.py +++ b/market_trade/core/Ind_Gator.py @@ -24,9 +24,9 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw -import Ind_Alligator +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw +import market_trade.core.Ind_Alligator class Gator: @@ -104,5 +104,5 @@ class Gator: self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_Ishimoku.py b/market_trade/core/Ind_Ishimoku.py index 381f734..21fbff6 100644 --- a/market_trade/core/Ind_Ishimoku.py +++ b/market_trade/core/Ind_Ishimoku.py @@ -25,7 +25,7 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots import CoreDraw init_notebook_mode() -import CoreTraidMath +import market_trade.core.CoreTraidMath import plotly.express as px @@ -183,6 +183,6 @@ class Ishimoku: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) #print(ans) return ans diff --git a/market_trade/core/Ind_LRI.py b/market_trade/core/Ind_LRI.py index d518592..b59c87a 100644 --- a/market_trade/core/Ind_LRI.py +++ b/market_trade/core/Ind_LRI.py @@ -25,8 +25,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class LRI: @@ -100,5 +100,5 @@ class LRI: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_STD.py b/market_trade/core/Ind_STD.py index a7f6489..f63fca5 100644 --- a/market_trade/core/Ind_STD.py +++ b/market_trade/core/Ind_STD.py @@ -25,8 +25,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class ISTD: def __init__(self, base_df,options={}, needFig=False,showOnlyIndex=True,drawFig=False): @@ -84,5 +84,5 @@ class ISTD: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/core/Ind_Stochastic.py b/market_trade/core/Ind_Stochastic.py index b3eb5b1..5c3129a 100644 --- a/market_trade/core/Ind_Stochastic.py +++ b/market_trade/core/Ind_Stochastic.py @@ -25,8 +25,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class Stochastic: @@ -141,7 +141,7 @@ class Stochastic: - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans diff --git a/market_trade/core/Ind_bollingerBands.py b/market_trade/core/Ind_bollingerBands.py index da9ef81..53ae802 100644 --- a/market_trade/core/Ind_bollingerBands.py +++ b/market_trade/core/Ind_bollingerBands.py @@ -24,8 +24,8 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import CoreTraidMath -import CoreDraw +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw class BB: @@ -105,5 +105,5 @@ class BB: }) self.figDict=req - ans = CoreDraw.coreDraw(req,drawFig) + ans = market_trade.core.CoreDraw.coreDraw(req,drawFig) return ans \ No newline at end of file diff --git a/market_trade/signals/Signal_1.py b/market_trade/signals/Signal1.py similarity index 92% rename from market_trade/signals/Signal_1.py rename to market_trade/signals/Signal1.py index be69f75..0a2564d 100644 --- a/market_trade/signals/Signal_1.py +++ b/market_trade/signals/Signal1.py @@ -24,20 +24,20 @@ from plotly.offline import init_notebook_mode, iplot from plotly.subplots import make_subplots init_notebook_mode() -import market_trade.CoreTraidMath -import market_trade.CoreDraw -import market_trade.Ind_bollingerBands -import Siganls.coreSignal +import market_trade.core.CoreTraidMath +import market_trade.core.CoreDraw +import market_trade.core.Ind_bollingerBands +import market_trade.signals.coreSignal -class SignalB_B_1(Siganls.coreSignal): +class SignalBollingerBands1(market_trade.signals.coreSignal): def __init__(self, IndDict={}, mode='retro', ): super().__init__(name='1.1',mode=mode,target='nextBar',valeType='price') self.IndDict=IndDict - self.BB=Ind_bollingerBands.BB( + self.BB=market_trade.core.Ind_bollingerBands.BB( IndDict['BB']['df'], IndDict['BB']['params'], IndDict['BB']['needFig'], diff --git a/tools/test_signal.py b/tools/test_signal.py new file mode 100644 index 0000000..1595fd2 --- /dev/null +++ b/tools/test_signal.py @@ -0,0 +1,37 @@ +""" +Signal_1 +BB +синал +предсказывающий +будет +ли +цена +за +следубщий +бар +больше\меньше +цены +закртыия +текущего, если +текущиий +бар +закрылся +ниже\выше +диапазона +BB +""" + +import market_trade.signals.Signal1 + +df_candle = [] +ind_params = {'MeanType': 'SMA', 'window': 5, 'valueType': 'low', 'kDev': 2} +# df_candle[:3000],ind_params,True,False,True +# window 5..100 (5) | valueType: 'open', 'low' | 'kdev' : 1..4 (0.1) +indEl1 = { + 'df': df_candle[:3000], + 'params': ind_params, + 'needFig': False, + 'showOnlyIndex': False, + 'drawFig': True +} +a = market_trade.signals.Signal1.SignalBollingerBands1({'BB': indEl1})