init
This commit is contained in:
@@ -207,20 +207,14 @@ class BuySellChecker:
|
||||
##########################
|
||||
if i < 40:
|
||||
if data["low"][i] < data["lower"][i]+5:
|
||||
if data["slow_k"][i-1] < 20 and data["slow_k"][i] < 25:
|
||||
if data["slow_k"][i-1] < 40 and data["slow_k"][i] < 45:
|
||||
if data["slow_k"][i-1] < data["slow_d"][i-1] and data["slow_d"][i] < data["slow_k"][i] and data["slow_k"][i-1] < data["slow_k"][i]:
|
||||
if data["close"][i] < data["avg5"][i]:
|
||||
buy = data["close"][i] - 5
|
||||
else:
|
||||
buy = data["low"][i] - 5
|
||||
buy = data["low"][i]
|
||||
else:
|
||||
if data["low"][i] < data["lower"][i]+5:
|
||||
if data["slow_k"][i-1] < 20 and data["slow_k"][i] < 25:
|
||||
if data["slow_k"][i-1] < data["slow_d"][i-1] and data["slow_d"][i] < data["slow_k"][i] and data["slow_k"][i-1] < data["slow_k"][i]:
|
||||
if data["close"][i] < data["avg5"][i]:
|
||||
buy = data["close"][i] - 5
|
||||
else:
|
||||
buy = data["low"][i] - 5
|
||||
if data["low"][i] < data["lower"][i]:
|
||||
if data["slow_k"][i-1] < 50 and data["slow_k"][i] < 55:
|
||||
if data["slow_k"][i-1] < data["slow_d"][i-1] and data["slow_k"][i] > data["slow_d"][i] and data["slow_k"][i-1] <= data["slow_k"][i]:
|
||||
buy = data["low"][i]
|
||||
|
||||
#############################
|
||||
### STOCHASTIC weight 분석 ###
|
||||
@@ -427,12 +421,12 @@ class BuySellChecker:
|
||||
rsi = rsi_df['rsi'].values.tolist()
|
||||
rsis = rsi_df['rsis'].values.tolist()
|
||||
|
||||
temp = {"date": point_temp[:-window+1],
|
||||
temp = {"date": point_temp[window-1:],
|
||||
"open": open_list, "high": high_list, "low": low_list, "close": close_list, "volume": vol_list, "upper": upper, "lower": lower,
|
||||
"avg5": avg5, "avg10": avg10, "avg30": avg30, "avg60": avg60,
|
||||
"fast_k": fast_k, "slow_k": slow_k, "slow_d": slow_d, "rsi": rsi, "rsis": rsis}
|
||||
data = pd.DataFrame(temp)
|
||||
df_final_time = pd.DatetimeIndex(point_temp[:-window+1])
|
||||
df_final_time = pd.DatetimeIndex(point_temp[window-1:])
|
||||
data.index = df_final_time
|
||||
|
||||
return data
|
||||
Reference in New Issue
Block a user