Merge branch 'remotepairlist' of https://github.com/Bloodhunter4rc/freqtrade into remotepairlist
This commit is contained in:
@@ -89,10 +89,10 @@ class PerformanceFilter(IPairList):
|
|||||||
# Sort the list using:
|
# Sort the list using:
|
||||||
# - primarily performance (high to low)
|
# - primarily performance (high to low)
|
||||||
# - then count (low to high, so as to favor same performance with fewer trades)
|
# - then count (low to high, so as to favor same performance with fewer trades)
|
||||||
# - then pair name alphametically
|
# - then by prior index, keeping original sorting order
|
||||||
sorted_df = list_df.merge(performance, on='pair', how='left')\
|
sorted_df = list_df.merge(performance, on='pair', how='left')\
|
||||||
.fillna(0).sort_values(by=['count', 'prior_idx'], ascending=True)\
|
.fillna(0).sort_values(by=['profit_ratio', 'count', 'prior_idx'],
|
||||||
.sort_values(by=['profit_ratio'], ascending=False)
|
ascending=[False, True, True])
|
||||||
if self._min_profit is not None:
|
if self._min_profit is not None:
|
||||||
removed = sorted_df[sorted_df['profit_ratio'] < self._min_profit]
|
removed = sorted_df[sorted_df['profit_ratio'] < self._min_profit]
|
||||||
for _, row in removed.iterrows():
|
for _, row in removed.iterrows():
|
||||||
|
|||||||
+2
-1
@@ -1,4 +1,5 @@
|
|||||||
numpy==1.24.3
|
numpy==1.25.0; python_version > '3.8'
|
||||||
|
numpy==1.24.3; python_version <= '3.8'
|
||||||
pandas==2.0.3
|
pandas==2.0.3
|
||||||
pandas-ta==0.3.14b
|
pandas-ta==0.3.14b
|
||||||
|
|
||||||
|
|||||||
@@ -93,8 +93,8 @@ EXCHANGES = {
|
|||||||
}]
|
}]
|
||||||
},
|
},
|
||||||
'kraken': {
|
'kraken': {
|
||||||
'pair': 'BTC/USDT',
|
'pair': 'BTC/USD',
|
||||||
'stake_currency': 'USDT',
|
'stake_currency': 'USD',
|
||||||
'hasQuoteVolume': True,
|
'hasQuoteVolume': True,
|
||||||
'timeframe': '1h',
|
'timeframe': '1h',
|
||||||
'leverage_tiers_public': False,
|
'leverage_tiers_public': False,
|
||||||
|
|||||||
Reference in New Issue
Block a user