From 6aa815871158b96feaa455cabfe1397216621742 Mon Sep 17 00:00:00 2001 From: Alexey Velikiy Date: Tue, 21 Aug 2018 22:06:28 +0300 Subject: [PATCH] rm ANALYTIC_UNITS_FOLDER usage (#108) --- analytics/config.py | 1 - .../detectors/general_detector/general_detector.py | 12 ------------ analytics/detectors/pattern_detector.py | 4 ---- 3 files changed, 17 deletions(-) diff --git a/analytics/config.py b/analytics/config.py index 90ed22a..d072594 100644 --- a/analytics/config.py +++ b/analytics/config.py @@ -28,7 +28,6 @@ def get_config_field(field, default_val = None): DATASET_FOLDER = os.path.join(DATA_FOLDER, 'datasets') -ANALYTIC_UNITS_FOLDER = os.path.join(DATA_FOLDER, 'analytic_units') MODELS_FOLDER = os.path.join(DATA_FOLDER, 'models') METRICS_FOLDER = os.path.join(DATA_FOLDER, 'metrics') diff --git a/analytics/detectors/general_detector/general_detector.py b/analytics/detectors/general_detector/general_detector.py index ab4e249..7ddf1d3 100644 --- a/analytics/detectors/general_detector/general_detector.py +++ b/analytics/detectors/general_detector/general_detector.py @@ -19,7 +19,6 @@ class GeneralDetector: def __init__(self, anomaly_name): self.anomaly_name = anomaly_name - self.load_anomaly_config() parsedUrl = urlparse(self.anomaly_config['panelUrl']) origin = parsedUrl.scheme + '://' + parsedUrl.netloc @@ -109,17 +108,6 @@ class GeneralDetector: self.preprocessor.set_data_provider(self.data_prov) self.preprocessor.synchronize() - def load_anomaly_config(self): - with open(os.path.join(config.ANALYTIC_UNITS_FOLDER, self.anomaly_name + ".json"), 'r') as config_file: - self.anomaly_config = json.load(config_file) - - def get_anomalies(self): - labeled_anomalies_file = os.path.join(config.ANALYTIC_UNITS_FOLDER, self.anomaly_name + "_labeled.json") - if not os.path.exists(labeled_anomalies_file): - return [] - with open(labeled_anomalies_file) as file: - return json.load(file) - def create_algorithm(self): return SupervisedAlgorithm() diff --git a/analytics/detectors/pattern_detector.py b/analytics/detectors/pattern_detector.py index 344b54b..b0de85d 100644 --- a/analytics/detectors/pattern_detector.py +++ b/analytics/detectors/pattern_detector.py @@ -98,10 +98,6 @@ class PatternDetector: def synchronize_data(self): self.data_prov.synchronize() - def __load_anomaly_config(self): - with open(os.path.join(config.ANALYTIC_UNITS_FOLDER, self.analytic_unit_id + ".json"), 'r') as config_file: - self.anomaly_config = json.load(config_file) - def __save_model(self): logger.info("Save model '%s'" % self.analytic_unit_id) model_filename = os.path.join(config.MODELS_FOLDER, self.analytic_unit_id + ".m")