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

Merge 7200bbada8 into 858d2329e5

Browse Source
This commit is contained in:
Baudbox 2017-11-25 18:29:29 +00:00 committed by GitHub
commit b7f659d1f1
5 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -72,6 +72,7 @@ target/
# pyenv # pyenv
.python-version .python-version
virtualenv
config.json config.json
preprocessor.py preprocessor.py

16
README.md
View File

@ -74,14 +74,20 @@ Use your favorite AUR helper and install `python-freqtrade-git`.
`develop` branch has often new features, but might also cause breaking changes. To use it, you are encouraged to join our [slack channel](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE). `develop` branch has often new features, but might also cause breaking changes. To use it, you are encouraged to join our [slack channel](https://join.slack.com/t/highfrequencybot/shared_invite/enQtMjQ5NTM0OTYzMzY3LWMxYzE3M2MxNDdjMGM3ZTYwNzFjMGIwZGRjNTc3ZGU3MGE3NzdmZGMwNmU3NDM5ZTNmM2Y3NjRiNzk4NmM4OGE).
``` ```bash
$ cd freqtrade/ $ mkdir freqtrade && cd freqtrade/
# copy example config. Dont forget to insert your api keys # Create an isolated Python virtual environment
$ pip install virtualenv
$ virtualenv ./virtualenv --python=$(which python3)
# Activate the virtualenv
$ . virtualenv/bin/activate
# Copy example config. Dont forget to insert your api keys
$ cp config.json.example config.json $ cp config.json.example config.json
$ python -m venv .env # Install requirements
$ source .env/bin/activate
$ pip install -r requirements.txt $ pip install -r requirements.txt
# Install Freqtrade
$ pip install -e . $ pip install -e .
# Run Freqtrade
$ ./freqtrade/main.py $ ./freqtrade/main.py
``` ```

36
freqtrade/analyze.py
View File

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

41
freqtrade/tests/conftest.py
View File

@ -13,17 +13,20 @@ from freqtrade.misc import CONF_SCHEMA
def default_conf(): def default_conf():
""" Returns validated configuration suitable for most tests """ """ Returns validated configuration suitable for most tests """
configuration = { configuration = {
"max_open_trades": 1, "max_open_trades": 3,
"stake_currency": "BTC", "stake_currency": "BTC",
"stake_amount": 0.05, "stake_amount": 0.004,
"dry_run": True, "dry_run": True,
"minimal_roi": { "minimal_roi": {
"40": 0.0, "30": 0.0,
"30": 0.01, "25": 0.015,
"20": 0.02, "20": 0.020,
"0": 0.04 "15": 0.025,
"10": 0.030,
"5": 0.035,
"0": 0.045
}, },
"stoploss": -0.10, "stoploss": -0.03,
"bid_strategy": { "bid_strategy": {
"ask_last_balance": 0.0 "ask_last_balance": 0.0
}, },
@ -32,13 +35,8 @@ def default_conf():
"enabled": True, "enabled": True,
"key": "key", "key": "key",
"secret": "secret", "secret": "secret",
"pair_whitelist": [ "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_ETH", "BTC_MER", "BTC_FTC", "BTC_INCNT", "BTC_TIX", "BTC_RCN", "BTC_RLC", "BTC_TKN", "BTC_TRST", "BTC_MLN", "BTC_TIME", "BTC_LUN", "BTC_WAVES"]
"BTC_TKN",
"BTC_TRST",
"BTC_SWT",
"BTC_BCC"
]
}, },
"telegram": { "telegram": {
"enabled": True, "enabled": True,
@ -56,14 +54,17 @@ def backtest_conf():
return { return {
"max_open_trades": 3, "max_open_trades": 3,
"stake_currency": "BTC", "stake_currency": "BTC",
"stake_amount": 0.01, "stake_amount": 0.004,
"minimal_roi": { "minimal_roi": {
"40": 0.0, "30": 0.0,
"30": 0.01, "25": 0.015,
"20": 0.02, "20": 0.020,
"0": 0.04 "15": 0.025,
"10": 0.030,
"5": 0.035,
"0": 0.045
}, },
"stoploss": -0.10 "stoploss": -0.03
} }

1
src/python-bittrex Submodule

@ -0,0 +1 @@
Subproject commit 0373363e1a06ac1d4156cca97ff5f02946452a52