Unitoo
/
freqtrade-strategies
2
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

Merge conflict solved

This commit is contained in:
Claudio Maradonna 2021-04-27 09:48:01 +02:00
parent 5dc784ff96 4209d429ba
commit 61e4f3dc65
Signed by: claudiomaradonna
GPG Key ID: 0CBA58694C5680D9
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
USDT/CAKE_1.py
View File

@ -13,7 +13,7 @@ import talib.abstract as ta
import freqtrade.vendor.qtpylib.indicators as qtpylib
class Cake_1(IStrategy):
class CAKE_1(IStrategy):
"""
This is a strategy template to get you started.
More information in https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-optimization.md

2
USDT/CAKE_2.py
View File

@ -13,7 +13,7 @@ import talib.abstract as ta
import freqtrade.vendor.qtpylib.indicators as qtpylib
class Cake_2(IStrategy):
class CAKE_2(IStrategy):
"""
This is a strategy template to get you started.
More information in https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-optimization.md

5
USDT/VET.md Normal file
View File

@ -0,0 +1,5 @@
### VET/USDT
| File | Start date | End date | Tot. Profit | Avg. Profit | Objective |
| ---- | ---------- | -------- | ----------- | ----------- | --------- |
| [VET_1](USDT/VET_1.py) | 2021-02-15 06:00:00 | 2021-04-26 09:55:00 | 230.33% | 1.18% | -14.7 |

20
USDT/VET_Feb2021.py → USDT/VET_1.py
View File

@ -13,7 +13,7 @@ import talib.abstract as ta
import freqtrade.vendor.qtpylib.indicators as qtpylib
class VET_Feb2021(IStrategy):
class VET_1(IStrategy):
"""
This is a strategy template to get you started.
More information in https://github.com/freqtrade/freqtrade/blob/develop/docs/bot-optimization.md
@ -36,15 +36,15 @@ class VET_Feb2021(IStrategy):
# Minimal ROI designed for the strategy.
# This attribute will be overridden if the config file contains "minimal_roi".
minimal_roi = {
"176": 0,
"62": 0.01208,
"21": 0.02821,
"0": 0.07683
"155": 0,
"90": 0.02968,
"32": 0.09639,
"0": 0.27905
}
# Optimal stoploss designed for the strategy.
# This attribute will be overridden if the config file contains "stoploss".
stoploss = -0.34245
stoploss = -0.22321
# Trailing stoploss
trailing_stop = False
@ -339,8 +339,7 @@ class VET_Feb2021(IStrategy):
"""
dataframe.loc[
(
(dataframe['fastd'] < 23) &
(dataframe['adx'] > 20) &
(dataframe['fastd'] < 44) &
(dataframe['close'] < dataframe['bb_lowerband'])
#(qtpylib.crossed_above(dataframe['rsi'], 30)) # Signal: RSI crosses above 30
#(dataframe['tema'] <= dataframe['bb_middleband']) & # Guard: tema below BB middle
@ -360,9 +359,8 @@ class VET_Feb2021(IStrategy):
"""
dataframe.loc[
(
(dataframe['fastd'] > 96) &
(dataframe['mfi'] > 85) &
(dataframe['close'] > dataframe['bb_upperband'])
(dataframe['fastd'] > 75) &
(qtpylib.crossed_above(dataframe['sar'], dataframe['close']))
#(qtpylib.crossed_above(dataframe['rsi'], 70)) # Signal: RSI crosses above 70
#(dataframe['tema'] > dataframe['bb_middleband']) & # Guard: tema above BB middle
#(dataframe['tema'] < dataframe['tema'].shift(1)) & # Guard: tema is falling