|
@@ -34,26 +34,26 @@ def real_price(datas):
|
|
def ma(stock, num, data):
|
|
def ma(stock, num, data):
|
|
global engine_stock
|
|
global engine_stock
|
|
try:
|
|
try:
|
|
- i = (num - 1) * -1
|
|
|
|
|
|
+ i = (num- 1) * -1
|
|
df = pd.read_sql_query(
|
|
df = pd.read_sql_query(
|
|
'select close from `%s_1d`' % stock, engine_stock)
|
|
'select close from `%s_1d`' % stock, engine_stock)
|
|
except:
|
|
except:
|
|
return 9999999
|
|
return 9999999
|
|
else:
|
|
else:
|
|
- ma_num = (sum(df['close'][i:-1]) + data[stock]['lastPrice'])/num
|
|
|
|
|
|
+ ma_num = (sum(df['close'][i:]) + data[stock]['lastPrice'])/num
|
|
return ma_num
|
|
return ma_num
|
|
|
|
|
|
|
|
|
|
def ma_1(stock, num):
|
|
def ma_1(stock, num):
|
|
global engine_stock
|
|
global engine_stock
|
|
- i = num * -1
|
|
|
|
|
|
+ i = (num) * -1
|
|
try:
|
|
try:
|
|
df = pd.read_sql_query(
|
|
df = pd.read_sql_query(
|
|
'select close from `%s_1d`' % stock, engine_stock)
|
|
'select close from `%s_1d`' % stock, engine_stock)
|
|
except BaseException:
|
|
except BaseException:
|
|
return 9999999
|
|
return 9999999
|
|
else:
|
|
else:
|
|
- ma_num_1 = df['close'][i:-1].mean()
|
|
|
|
|
|
+ ma_num_1 = df['close'][i:].mean()
|
|
return ma_num_1
|
|
return ma_num_1
|
|
|
|
|
|
|
|
|