diff --git a/Simulation.py b/Simulation.py index 55dda2c..02fa9ab 100644 --- a/Simulation.py +++ b/Simulation.py @@ -143,7 +143,8 @@ class Simulation (HTS): def simulate(self, stock_code, today, method="rule"): if method == "answer": - self.labelMaker.makeCandidate(stock_code, today, view=True) + #self.labelMaker.makeCandidate(stock_code, today, view=True) + self.labelMaker.showLabels(stock_code, today) else: if method == "ml": LAST_DATA = self.stock2Vector.getLastData(stock_code, today, n=1) @@ -174,8 +175,8 @@ if __name__ == "__main__": # to check bying stock_codes = { - "122630": ['20220809'], - "252670": ['20220809'], + "122630": ['20220810'], + "252670": ['20220810'], } method = "answer" # "rule", "ml", "answer" diff --git a/resources/hts.db b/resources/hts.db index bebe626..e174945 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 5fd1bdb..010bad3 100644 --- a/stock/util/LabelMaker.py +++ b/stock/util/LabelMaker.py @@ -290,63 +290,23 @@ if __name__ == "__main__": view = True stock_code = "252670" - ymd = "20220810" + ymd = "20220809" if view: - bsLine, data = labelMaker.makeCandidate(stock_code, ymd, view=view) - - labelMaker.makeLabel(db_filename, "252670", "20220810", "0901", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "0902", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "0903", 0) - labelMaker.makeLabel(db_filename, "252670", "20220810", "0954", 0) - labelMaker.makeLabel(db_filename, "252670", "20220810", "0954", 0) - labelMaker.makeLabel(db_filename, "252670", "20220810", "0958", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1009", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1014", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1016", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1017", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1021", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1022", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1024", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1029", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1036", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1037", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1035", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1036", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1039", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1122", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1123", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1124", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1202", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1223", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1224", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1248", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1252", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1256", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1257", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1259", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1300", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1301", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1302", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1308", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1311", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1313", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1315", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1318", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1320", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1322", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1323", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1324", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1325", 2) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1450", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1451", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1455", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1459", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1504", 1) - labelMaker.makeLabel(db_filename, "252670", "20220810", "1518", 1) - - - + labelMaker.makeLabel(db_filename, "252670", "20220809", "0930", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0931", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0951", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0953", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0954", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0955", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0956", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "0959", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1509", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1515", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1516", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1518", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1519", 1) + labelMaker.makeLabel(db_filename, "252670", "20220809", "1520", 1) labelMaker.showLabels(stock_code, ymd) else: