fix test

aimclub · Oct 16, 2024 · a0e877b · a0e877b
1 parent c7d4c16
commit a0e877b
Show file tree

Hide file tree

Showing 6 changed files with 787 additions and 5 deletions.
diff --git a/examples/tutorial/__init__.py b/examples/tutorial/__init__.py
diff --git a/examples/tutorial/time_series/ts_classification/classification_example.ipynb b/examples/tutorial/time_series/ts_classification/classification_example.ipynb
diff --git a/examples/tutorial/time_series/ts_forecasting/__init__.py b/examples/tutorial/time_series/ts_forecasting/__init__.py
diff --git a/fedot_ind/core/models/base_extractor.py b/fedot_ind/core/models/base_extractor.py
@@ -131,10 +131,11 @@ def apply_window_for_stat_feature(self, ts_data: np.array,
 
         else:
             ts_slices = list(range(0, subseq_set.shape[1]))
-            features = list(map(lambda slice: feature_generator(subseq_set[:, slice]).features, ts_slices))
+            features = list(map(lambda slice: feature_generator(subseq_set[:, slice]), ts_slices))
             names = list(map(lambda ts_tup: [x + f'_on_interval: {ts_tup[1] + 1} - {ts_tup[1] + 1 + window_size}'
                                              for x in ts_tup[0].supplementary_data['feature_name']],
                              zip(features, ts_slices)))
+            features = [x.features for x in features]
 
         return features, names
 

diff --git a/fedot_ind/core/repository/IndustrialDispatcher.py b/fedot_ind/core/repository/IndustrialDispatcher.py
@@ -41,7 +41,6 @@ def _multithread_eval(self, individuals_to_evaluate):
                                                                           uid_of_individual=ind.uid,
                                                                           logs_initializer=log),
                                           individuals_to_evaluate))
-
         return evaluation_results
 
     def _eval_at_least_one(self, individuals):

diff --git a/tests/unit/api/main/test_api_main.py b/tests/unit/api/main/test_api_main.py
@@ -5,6 +5,7 @@
 from matplotlib import get_backend, pyplot as plt
 
 from fedot_ind.api.main import FedotIndustrial
+from fedot_ind.api.utils.data import SynthTimeSeriesData
 from fedot_ind.tools.synthetic.ts_datasets_generator import TimeSeriesDatasetsGenerator
 
 
@@ -109,7 +110,7 @@ def ts_config():
 
 def test_generate_ts(fedot_industrial_classification, ts_config):
     industrial = fedot_industrial_classification
-    ts = industrial.generate_ts(ts_config=ts_config)
+    ts = SynthTimeSeriesData(ts_config).generate_ts()
 
     assert isinstance(ts, np.ndarray)
     assert ts.shape[0] == 1000
@@ -129,8 +130,7 @@ def test_generate_anomaly_ts(
         ts_config,
         anomaly_config):
     industrial = fedot_industrial_classification
-    init_synth_ts, mod_synth_ts, synth_inters = industrial.generate_anomaly_ts(
-        ts_data=ts_config, anomaly_config=anomaly_config)
+    init_synth_ts, mod_synth_ts, synth_inters = SynthTimeSeriesData(anomaly_config).generate_anomaly_ts(ts_config)
     assert len(init_synth_ts) == len(mod_synth_ts)
     for anomaly_type in synth_inters:
         for interval in synth_inters[anomaly_type]: