Fix params

aimclub · May 16, 2024 · 6fd8b51 · 6fd8b51
1 parent 4a04ddc
commit 6fd8b51
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 30 deletions.
diff --git a/fedot_ind/core/repository/data/default_operation_params.json b/fedot_ind/core/repository/data/default_operation_params.json
@@ -1,73 +1,83 @@
 {
   "eigen_basis": {
-    "sv_selector": "median",
-    "window_size": 25,
+    "window_size": 20,
     "stride": 5,
-    "rank_regularization": "hard_thresholding"
+    "rank_regularization": "hard_thresholding",
+    "low_rank_approximation": true,
+    "tensor_approximation": false
   },
   "wavelet_basis": {
     "n_components": 2,
     "wavelet": "mexh"
   },
   "fourier_basis": {
-    "threshold": 20000
+    "threshold": 20000,
+    "approximation": "smooth"
   },
   "topological_extractor": {
-    "n_jobs": 2,
     "window_size_as_share": 0.33,
     "max_homology_dimension": 1,
     "metric": "euclidean",
     "window_size": 25,
     "stride": 5
   },
   "quantile_extractor": {
-    "stride": 5,
+    "stride": 1,
     "window_size": 0
   },
   "riemann_extractor": {
-    "n_filter": 4,
     "estimator": "scm",
     "tangent_metric": "riemann",
-    "SPD_metric": "riemann"
+    "SPD_metric": "riemann",
+    "n_filter": 2,
+    "extraction_strategy": "ensemble"
   },
   "recurrence_extractor": {
-    "window_mode": true,
-    "min_signal_ratio": 0.5,
-    "max_signal_ratio": 0.75,
-    "image_mode": false,
-    "window_size": 20,
-    "stride": 5,
-    "rec_metric": "euclidean"
-  },
-  "signal_extractor": {
-    "n_components": 6,
-    "wavelet": "mexh"
+    "window_size": 0,
+    "stride": 1,
+    "rec_metric": "cosine",
+    "image_mode": false
   },
   "minirocket_extractor": {
     "num_features": 10000
   },
   "chronos_extractor": {
     "num_features": 10000
   },
+  "channel_filtration": {
+    "distance": "euclidean",
+    "shrink": 1e-5,
+    "centroid_metric": "euclidean",
+    "selection_strategy": "sum"
+  },
   "patch_tst_model": {
     "epochs": 100,
     "batch_size": 32,
-    "activation": "relu"
+    "activation": "ReLU",
+    "learning_rate": 0.001,
+    "use_amp": false,
+    "forecast_length": null,
+    "patch_len": null,
+    "ouput_attention": false,
+    "forecast_mode": "out_of_sample"
   },
   "omniscale_model": {
     "epochs": 100,
     "batch_size": 32,
-    "activation": "softmax"
+    "activation": "Softmax",
+    "num_classes": 1
   },
   "inception_model": {
     "epochs": 100,
     "batch_size": 32,
-    "activation": "softmax"
+    "activation": "Softmax",
+    "num_classes": 1
   },
   "resnet_model": {
     "epochs": 100,
     "batch_size": 32,
-    "activation": "softmax"
+    "activation": "Softmax",
+    "model_name": "ResNet18"
   },
   "ssa_forecaster": {
     "window_size_method": "hac",

diff --git a/fedot_ind/core/tuning/search_space.py b/fedot_ind/core/tuning/search_space.py
@@ -2,7 +2,7 @@
 
 from hyperopt import hp
 
-#from fedot_ind.core.repository.constanst_repository import DISTANCE_METRICS
+from fedot_ind.core.repository.constanst_repository import DISTANCE_METRICS
 
 NESTED_PARAMS_LABEL = 'nested_label'
 
@@ -11,7 +11,9 @@
         {'window_size': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(5, 50, 5)]]},
          'stride': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(1, 10, 1)]]},
          'rank_regularization': {'hyperopt-dist': hp.choice, 'sampling-scope': [
-             ['hard_thresholding', 'explained_dispersion']]}},
+             ['hard_thresholding', 'explained_dispersion']]},
+         'low_rank_approximation': {'hyperopt-dist': hp.choice, 'sampling-scope': [[True, False]]},
+         'tensor_approximation': {'hyperopt-dist': hp.choice, 'sampling-scope': [[True, False]]}},
     'wavelet_basis':
         {'n_components': {'hyperopt-dist': hp.uniformint, 'sampling-scope': [2, 10]},
          'wavelet': {'hyperopt-dist': hp.choice,
@@ -42,18 +44,25 @@
     'recurrence_extractor':
         {'window_size': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(5, 50, 5)]]},
          'stride': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(1, 10, 1)]]},
-         # 'rec_metric': (hp.choice, [['chebyshev', 'cosine', 'euclidean', 'mahalanobis']]),
+         'rec_metric': (hp.choice, [['cosine', 'euclidean']]),
          'image_mode': {'hyperopt-dist': hp.choice, 'sampling-scope': [[True, False]]}},
-    'signal_extractor':
-        {'n_components': {'hyperopt-dist': hp.uniformint, 'sampling-scope': [2, 10]},
-         'wavelet': {'hyperopt-dist': hp.choice,
-                     'sampling-scope': [['mexh', 'morl', 'db5', 'sym5']]}},
     'minirocket_extractor':
         {'num_features': {'hyperopt-dist': hp.choice,
                           'sampling-scope': [[x for x in range(5000, 20000, 1000)]]}},
     'chronos_extractor':
         {'num_features': {'hyperopt-dist': hp.choice,
                           'sampling-scope': [[x for x in range(5000, 20000, 1000)]]}},
+    'channel_filtration':
+        {'distance': {'hyperopt-dist': hp.choice,
+                      'sampling-scope': [['manhattan', 'euclidean', 'chebyshev']]},
+         'centroid_metric': {'hyperopt-dist': hp.choice,
+                             'sampling-scope': [['manhattan', 'euclidean', 'chebyshev']]},
+         'sample_metric': {'hyperopt-dist': hp.choice,
+                           'sampling-scope': [list(DISTANCE_METRICS.keys())]},
+
+         'selection_strategy': {'hyperopt-dist': hp.choice,
+                                'sampling-scope': [['sum', 'pairwise']]}
+         },
     'patch_tst_model':
         {'epochs': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(10, 100, 10)]]},
          'batch_size': {'hyperopt-dist': hp.choice, 'sampling-scope': [[x for x in range(8, 64, 6)]]},