이하영

주간보고서

...@@ -6,7 +6,7 @@ from pandas import * ...@@ -6,7 +6,7 @@ from pandas import *
6 from Logger import * 6 from Logger import *
7 import cf 7 import cf
8 8
9 -class Simulator_Func: 9 +class Simulator_Api:
10 def __init__(self,simul_num,op,db_name): 10 def __init__(self,simul_num,op,db_name):
11 self.simul_num=int(simul_num) 11 self.simul_num=int(simul_num)
12 12
...@@ -231,18 +231,18 @@ class Simulator_Func: ...@@ -231,18 +231,18 @@ class Simulator_Func:
231 index=a_balance['id']) 231 index=a_balance['id'])
232 232
233 # transaction table 생성 233 # transaction table 생성
234 - def init_df_transaction(self): 234 + def init_df_all_stocks(self):
235 - trs={'id':[]} 235 + all_stocks={'id':[]}
236 - self.df_transaction=DataFrame(trs, 236 + self.df_all_stocks=DataFrame(all_stocks,
237 - columns=['id', 'order_num', 'code', 'code_name', 'rate', 'purchase_rate', 237 + columns=['id', 'order_num', 'code', 'code_name', 'rate', 'purchase_rate',
238 - 'purchase_price','present_price', 'valuation_price','valuation_profit', 238 + 'purchase_price','present_price', 'valuation_price','valuation_profit',
239 - 'holding_amount', 'buy_date', 'item_total_purchase','chegyul_check', 239 + 'holding_amount', 'buy_date', 'item_total_purchase','chegyul_check',
240 - 'invest_unit','sell_date', 'sell_price', 'sell_rate', 240 + 'invest_unit','sell_date', 'sell_price', 'sell_rate',
241 - 'yes_close', 'close', 'd1_diff_rate', 'd1_diff', 241 + 'yes_close','d1_diff_rate', 'd1_diff',
242 - 'open', 'high','low','volume', 242 + 'open', 'close','high','low','volume',
243 - 'clo5', 'clo10', 'clo20', 'clo60','clo120', 243 + 'clo5', 'clo10', 'clo20', 'clo60','clo120',
244 - "clo5_diff_rate", "clo10_diff_rate","clo20_diff_rate", 244 + "clo5_diff_rate", "clo10_diff_rate","clo20_diff_rate",
245 - "clo60_diff_rate", "clo120_diff_rate"]) 245 + "clo60_diff_rate", "clo120_diff_rate"])
246 246
247 # account_balance(잔고 데이터)에 저장된 가장 최근의 날짜를 가져오는 함수 247 # account_balance(잔고 데이터)에 저장된 가장 최근의 날짜를 가져오는 함수
248 def get_last_date_account_balance(self): 248 def get_last_date_account_balance(self):
...@@ -1217,4 +1217,4 @@ class Simulator_Func: ...@@ -1217,4 +1217,4 @@ class Simulator_Func:
1217 "clo60_diff_rate", "clo120_diff_rate", 1217 "clo60_diff_rate", "clo120_diff_rate",
1218 'yes_clo5', 'yes_clo10', 'yes_clo20', 'yes_clo60','yes_clo120', 1218 'yes_clo5', 'yes_clo10', 'yes_clo20', 'yes_clo60','yes_clo120',
1219 'vol5', 'vol10', 'vol20', 'vol60', 'vol120']) 1219 'vol5', 'vol10', 'vol20', 'vol60', 'vol120'])
1220 - return df_daily_buy_list 1220 + return df_daily_buy_list
...\ No newline at end of file ...\ No newline at end of file
......
This diff is collapsed. Click to expand it.
No preview for this file type
No preview for this file type