adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sync

Browse Source
This commit is contained in:
baudbox 2017-11-25 18:28:15 +00:00
parent 3b53f2888c
commit 6be1c76d6b
3 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
config.json.baud Normal file
View File

@ -0,0 +1,37 @@
{
"max_open_trades": 5,
"stake_currency": "BTC",
"stake_amount": 0.0015,
"dry_run": false,
"minimal_roi": {
"35": 0.0,
"30": 0.05,
"25": 0.010,
"20": 0.015,
"15": 0.020,
"10": 0.025,
"5": 0.030,
"0": 0.035
},
"stoploss": -0.05,
"bid_strategy": {
"ask_last_balance": 0.0
},
"exchange": {
"name": "bittrex",
"key": "c7abd3e05621466f83c77dcc3c327cea",
"secret": "006ddad4d7b24c58861417b6a277a73c",
"pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT",
"BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN",
"BTC_ARDR"]
},
"telegram": {
"enabled": true,
"token": "461094382:AAHJyxQbsarsQGrQgVf5RfFC5s1nHCTGzTc",
"chat_id": "309637645"
},
"initial_state": "running",
"internals": {
"process_throttle_secs": 5
}
}

36
freqtrade/analyze.py
View File

@ -77,14 +77,19 @@ def populate_buy_trend(dataframe: DataFrame) -> DataFrame:
dataframe.loc[
(
(dataframe['rsi'] < 35) &
(dataframe['adx'] > 29) &
(dataframe['fastd'] < 35) &
(dataframe['adx'] > 30) &
(dataframe['plus_di'] > 0.5)
(dataframe['fastd'] > 0) &
(dataframe['plus_di'] > 0.1)
) |
(
(dataframe['adx'] > 65) &
(dataframe['plus_di'] > 0.5)
),
# (dataframe['tema'] <= dataframe['blower']) &
# (dataframe['rsi'] < 35) &
# (dataframe['fastd'] < 48) &
# (dataframe['adx'] > 29),
'buy'] = 1
return dataframe
@ -97,18 +102,21 @@ def populate_sell_trend(dataframe: DataFrame) -> DataFrame:
:return: DataFrame with buy column
"""
dataframe.loc[
(
(
(crossed_above(dataframe['rsi'], 70)) |
(crossed_above(dataframe['fastd'], 70))
) &
(dataframe['adx'] > 10) &
(dataframe['minus_di'] > 0)
) |
(
(dataframe['adx'] > 70) &
(dataframe['minus_di'] > 0.5)
),
# (
# (
# (crossed_above(dataframe['rsi'], 70)) |
# (crossed_above(dataframe['fastd'], 80))
# ) &
# (dataframe['adx'] < 30) &
# (dataframe['minus_di'] > 0)
# ) |
# (
# (dataframe['adx'] > 70) &
# (dataframe['minus_di'] > 0.5)
# ),
(crossed_above(dataframe['rsi'], 70))|
(crossed_above(dataframe['fastd'], 80)) &
(dataframe['adx'] > 31),
'sell'] = 1
return dataframe

2
freqtrade/tests/conftest.py
View File

@ -36,7 +36,7 @@ def default_conf():
"key": "key",
"secret": "secret",
"pair_whitelist": ["BTC_EDG", "BTC_ETC", "BTC_MTL", "BTC_OK", "BTC_PAY", "BTC_PIVX", "BTC_SNT", "BTC_XZC", "BTC_VTC", "BTC_XLM", "BTC_SWT",
"BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN"]
"BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", "BTC_WAVES"]
},
"telegram": {
"enabled": True,