refactor api, fixes in model, refactor example

aimclub · Dec 8, 2023 · 22cd011 · 22cd011
1 parent 113b3f7
commit 22cd011
Show file tree

Hide file tree

Showing 32 changed files with 597 additions and 22,713 deletions.
diff --git a/...amples/image_classification_example.ipynb → ...amples/image_classification_example.ipynb b/...amples/image_classification_example.ipynb → ...amples/image_classification_example.ipynb
diff --git a/...k_examples/object_detection_example.ipynb → ...k_examples/object_detection_example.ipynb b/...k_examples/object_detection_example.ipynb → ...k_examples/object_detection_example.ipynb
diff --git a/...ples/notebook_examples/rank_ensemle.ipynb → cases/notebook_examples/rank_ensemle.ipynb b/...ples/notebook_examples/rank_ensemle.ipynb → cases/notebook_examples/rank_ensemle.ipynb
diff --git a/...notebook_examples/ts_classification.ipynb → ...notebook_examples/ts_classification.ipynb b/...notebook_examples/ts_classification.ipynb → ...notebook_examples/ts_classification.ipynb
diff --git a/...image_classification/image_clf_example.py → ...image_classification/image_clf_example.py b/...image_classification/image_clf_example.py → ...image_classification/image_clf_example.py
diff --git a/...ision/object_detection/obj_rec_example.py → ...ision/object_detection/obj_rec_example.py b/...ision/object_detection/obj_rec_example.py → ...ision/object_detection/obj_rec_example.py
diff --git a/...s_classification/experiment_with_basis.py → ...s_classification/experiment_with_basis.py b/...s_classification/experiment_with_basis.py → ...s_classification/experiment_with_basis.py
diff --git a/...es/ts_regression/ts_regression_example.py → ...es/ts_regression/ts_regression_example.py b/...es/ts_regression/ts_regression_example.py → ...es/ts_regression/ts_regression_example.py
diff --git a/examples/example_utils.py b/examples/example_utils.py
@@ -8,6 +8,8 @@
 from fedot.core.repository.dataset_types import DataTypesEnum
 from fedot.core.repository.tasks import Task, TaskTypesEnum, TsForecastingParams
 from sklearn.metrics import f1_score, roc_auc_score
+from sklearn.preprocessing import LabelEncoder
+
 from fedot_ind.api.utils.path_lib import PROJECT_PATH
 from sklearn.metrics import explained_variance_score, max_error, mean_absolute_error, \
     mean_squared_error, d2_absolute_error_score, \
@@ -43,10 +45,13 @@ def init_input_data(X: pd.DataFrame, y: np.ndarray, task: str = 'classification'
     is_multivariate_data = check_multivariate_data(X)
     task_dict = {'classification': Task(TaskTypesEnum.classification),
                  'regression': Task(TaskTypesEnum.regression)}
+    if type((y)[0]) is np.str_:
+        label_encoder = LabelEncoder()
+        y = label_encoder.fit_transform(y)
     if is_multivariate_data:
         input_data = InputData(idx=np.arange(len(X)),
                                features=np.array(X.values.tolist()).astype(np.float),
-                               target=y.astype(np.float).reshape(-1, 1),
+                               target=y.reshape(-1, 1),
                                task=task_dict[task],
                                data_type=DataTypesEnum.image)
     else:

diff --git a/examples/fedot/fedot_ex.py b/examples/fedot/fedot_ex.py