Merge remote-tracking branch 'origin/Multiple_paires' into Multiple_paires
# Conflicts: # Zeus_8_3_2_B_4_2.py
This commit is contained in:
@@ -1713,10 +1713,13 @@ class Zeus_8_3_2_B_4_2(IStrategy):
|
|||||||
|
|
||||||
self.pairs[pair]['expected_profit'] = expected_profit
|
self.pairs[pair]['expected_profit'] = expected_profit
|
||||||
|
|
||||||
|
self.pairs[pair]['expected_profit'] = expected_profit
|
||||||
|
|
||||||
# print(
|
# print(
|
||||||
# f"Expected profit price={current_price:.4f} min_max={min_max:.4f} min_14={min_14_days:.4f} max_14={max_14_days:.4f} percent={percent:.4f} expected_profit={expected_profit:.4f}")
|
# f"Expected profit price={current_price:.4f} min_max={min_max:.4f} min_14={min_14_days:.4f} max_14={max_14_days:.4f} percent={percent:.4f} expected_profit={expected_profit:.4f}")
|
||||||
return expected_profit
|
return expected_profit
|
||||||
|
|
||||||
|
|
||||||
def calculateUpDownPct(self, dataframe, key):
|
def calculateUpDownPct(self, dataframe, key):
|
||||||
down_pct_values = np.full(len(dataframe), np.nan)
|
down_pct_values = np.full(len(dataframe), np.nan)
|
||||||
# Remplir la colonne avec les bons calculs
|
# Remplir la colonne avec les bons calculs
|
||||||
|
|||||||
Reference in New Issue
Block a user