added mean_ptp_distance features

aimclub · Sep 29, 2023 · 9047c31 · 9047c31
1 parent c744591
commit 9047c31
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/fedot_ind/core/architecture/preprocessing/DatasetLoader.py b/fedot_ind/core/architecture/preprocessing/DatasetLoader.py
@@ -734,7 +734,7 @@ def extract_data(self, dataset_name: str, data_path: str):
             y_test = y_test.astype(str)
 
         # Save data to tsv files
-        new_path = os.path.join(PROJECT_PATH, 'data', dataset_name)
+        new_path = os.path.join(PROJECT_PATH, 'fedot_ind','data', dataset_name)
         os.makedirs(new_path, exist_ok=True)
 
         self.logger.info(f'Saving {dataset_name} data files')

diff --git a/fedot_ind/core/models/quantile/stat_features.py b/fedot_ind/core/models/quantile/stat_features.py
@@ -49,7 +49,12 @@ def kurtosis(array: np.array) -> float:
 
 
 def n_peaks(array: np.array) -> int:
-    return len(find_peaks(array))
+    return len(find_peaks(array)[0])
+
+
+def mean_ptp_distance(array: np.array):
+    peaks, _ = find_peaks(array)
+    return np.mean(np.diff(peaks))
 
 
 def slope(array: np.array) -> float:

diff --git a/fedot_ind/core/models/quantile/stat_methods.py b/fedot_ind/core/models/quantile/stat_methods.py
@@ -26,6 +26,7 @@
     # 'base_entropy_': base_entropy,
     'shannon_entropy_': shannon_entropy,
     'ptp_amplitude_': ptp_amp,
+    'mean_ptp_distance_': mean_ptp_distance,
     'crest_factor_': crest_factor,
     'mean_ema_': mean_ema,
     'mean_moving_median_': mean_moving_median,