diff --git a/hts/HTS.py b/hts/HTS.py index f5e5d0e..8589096 100644 --- a/hts/HTS.py +++ b/hts/HTS.py @@ -568,6 +568,19 @@ class HTS: print("update...", stock_code, ymd) return + def clearLabel(self, db_filename, stock_code, ymd): + tableName = 'hts' + conn = sqlite3.connect(db_filename) + cursor = conn.cursor() + + cursor.execute('update ' + tableName + ' set label=? WHERE CODE=? and ymd=? ', (0, stock_code, ymd,)) + + conn.commit() + cursor.close() + conn.close() + print("delete...", stock_code, ymd) + return + def makeLabel(self, db_filename, stock_code, ymd, hms, label): tableName = 'hts' conn = sqlite3.connect(db_filename) diff --git a/resources/hts.db b/resources/hts.db index 0ae9772..317909e 100644 Binary files a/resources/hts.db and b/resources/hts.db differ diff --git a/stock/util/LabelMaker.py b/stock/util/LabelMaker.py index 865cbc6..3693fcd 100644 --- a/stock/util/LabelMaker.py +++ b/stock/util/LabelMaker.py @@ -267,7 +267,7 @@ class LabelMaker (HTS): bsLine['buy'] = [-1 for i in range(size)] for i in range(size): if result["label"][i] == 2: - bsLine['buy'][i] = result["close"][i] + bsLine['buy'][i] = result["low"][i] bsLine['sell'] = [-1 for i in range(size)] for i in range(size): if result["label"][i] == 1: @@ -288,59 +288,62 @@ if __name__ == "__main__": labelMaker = LabelMaker(RESOURCE_PATH) - view = True - stock_code = "122630" - ymd = "20220811" + UPDATE_MODE = True + if UPDATE_MODE: + stock_code = "122630" + ymd = '20220812' - if view: - labelMaker.makeLabel(db_filename, "122630", "20220811", "0905", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "0910", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "0911", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1030", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1034", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1109", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1110", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1111", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1207", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1211", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1228", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1229", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1230", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1231", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1232", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1249", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1303", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1304", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1420", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1421", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1436", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1437", 2) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1438", 2) + labelMaker.clearLabel(db_filename, stock_code, ymd) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0910", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0911", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0912", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0915", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0916", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0948", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0949", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0950", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0951", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0952", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "0953", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1023", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1024", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1025", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1026", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1056", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1057", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1058", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1059", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1116", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1117", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1118", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1207", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1208", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1209", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1210", 2) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1242", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1243", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1244", 1) + labelMaker.makeLabel(db_filename, stock_code, ymd, "1245", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "0949", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1000", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1001", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1016", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1017", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1045", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1049", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1126", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1127", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1315", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1316", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1317", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1458", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1459", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1500", 1) - labelMaker.makeLabel(db_filename, "122630", "20220811", "1501", 1) labelMaker.showLabels(stock_code, ymd) else: - stock_codes = ["252670", "122630"] + stock_codes = { + "252670": ['20220801', '20220802', '20220803', '20220804', '20220805', '20220808', '20220809', '20220810', '20220811'], + "122630": ['20220801', '20220802', '20220803', '20220804', '20220805', '20220808', '20220809', '20220810', '20220811'], + } + + view = True for stock_code in stock_codes: - ymds = labelMaker.getDate(stock_code) - for ymd in ymds: - logging.info(stock_code, ymd) - bsLine, data = labelMaker.makeCandidate(stock_code, ymd) - labelMaker.updateLabel(db_filename, stock_code, bsLine, data, ymd) \ No newline at end of file + for ymd in stock_codes[stock_code]: + if view: + labelMaker.showLabels(stock_code, ymd) + else: + stock_codes = ["252670", "122630"] + for stock_code in stock_codes: + ymds = labelMaker.getDate(stock_code) + for ymd in ymds: + logging.info(stock_code, ymd) + bsLine, data = labelMaker.makeCandidate(stock_code, ymd) + labelMaker.updateLabel(db_filename, stock_code, bsLine, data, ymd) \ No newline at end of file