diff --git a/HTS_122630.py b/HTS_122630.py index 2feb1ec..40ef8c0 100644 --- a/HTS_122630.py +++ b/HTS_122630.py @@ -8,7 +8,7 @@ from hts.OrderType import OrderType from hts.BuySellChecker import BuySellChecker from hts.OrderChecker import OrderChecker -from stock.util.LabelMaker import LabelMaker +from stock.util.LabelChecker import LabelChecker class HTS_122630 (HTS): RESOURCE_PATH = None @@ -16,7 +16,7 @@ class HTS_122630 (HTS): buy_count = None orderChecker = None buySellChecker = None - labelMaker = None + labelChecker = None def __init__(self, RESOURCE_PATH, stock_code, buy_count): super().__init__(RESOURCE_PATH) @@ -27,7 +27,7 @@ class HTS_122630 (HTS): self.orderChecker = OrderChecker(self.RESOURCE_PATH, self.stock_code) self.buySellChecker = BuySellChecker() - self.labelMaker = LabelMaker(RESOURCE_PATH) + self.labelChecker = LabelChecker(RESOURCE_PATH) return def getSellingPrice(self, log_time, stock_code, final_price, diff=None): @@ -147,8 +147,8 @@ class HTS_122630 (HTS): return def updteTodayStock(self, db_filename, stock_code, today_str): - bsLine, data = self.labelMaker.makeCandidate(stock_code, today_str) - self.labelMaker.updateLabel(db_filename, stock_code, bsLine, data, today_str) + bsLine, data = self.labelChecker.makeCandidate(stock_code, today_str) + self.labelChecker.updateLabel(db_filename, stock_code, bsLine, data, today_str) return if __name__ == "__main__": diff --git a/HTS_252670.py b/HTS_252670.py index 454488d..280d51f 100644 --- a/HTS_252670.py +++ b/HTS_252670.py @@ -8,7 +8,7 @@ from hts.OrderType import OrderType from hts.BuySellChecker import BuySellChecker from hts.OrderChecker import OrderChecker -from stock.util.LabelMaker import LabelMaker +from stock.util.LabelChecker import LabelChecker class HTS_252670 (HTS): @@ -17,7 +17,7 @@ class HTS_252670 (HTS): buy_count = None orderChecker = None buySellChecker = None - labelMaker = None + labelChecker = None def __init__(self, RESOURCE_PATH, stock_code, buy_count): super().__init__(RESOURCE_PATH) @@ -28,7 +28,7 @@ class HTS_252670 (HTS): self.orderChecker = OrderChecker(self.RESOURCE_PATH, self.stock_code) self.buySellChecker = BuySellChecker() - self.labelMaker = LabelMaker(RESOURCE_PATH) + self.labelChecker = LabelChecker(RESOURCE_PATH) return def getSellingPrice(self, log_time, stock_code, final_price, diff=None): @@ -146,8 +146,8 @@ class HTS_252670 (HTS): return def updteTodayStock(self, db_filename, stock_code, today_str): - bsLine, data = self.labelMaker.makeCandidate(stock_code, today_str) - self.labelMaker.updateLabel(db_filename, stock_code, bsLine, data, today_str) + bsLine, data = self.labelChecker.makeCandidate(stock_code, today_str) + self.labelChecker.updateLabel(db_filename, stock_code, bsLine, data, today_str) return