Merge branch 'AUTOML-70' into 'development'

fix selector features order

See merge request ai-lab-pmo/mltools/automl/LightAutoML!40

Author: dev-rinchin

lightautoml/pipelines/selection/base.py

@@ -1,6 +1,5 @@
 """Base class for selection pipelines."""
 
-from copy import copy
 from copy import deepcopy
 from typing import Any
 from typing import List
@@ -76,8 +75,10 @@ def selected_features(self) -> List[str]:
 
         """
         assert self._selected_features is not None, "Should be fitted first"
-        forced_features = self.forced_features if self.forced_features is not None else []
-        return list(set(self._selected_features + forced_features))
+        if self.forced_features is None:
+            return sorted(self._selected_features)
+
+        return sorted(set(self._selected_features + self.forced_features))
 
     @selected_features.setter
     def selected_features(self, val: List[str]):
@@ -110,8 +111,7 @@ def dropped_features(self) -> List[str]:
             list of dropped features.
 
         """
-        included = set(self._selected_features)
-        return [x for x in self._in_features if x not in included]
+        return [x for x in self._in_features if x not in set(self._selected_features)]
 
     def __init__(
         self,
@@ -200,13 +200,11 @@ def select(self, dataset: LAMLDataset) -> LAMLDataset:
             New dataset with selected features only.
 
         """
-        selected_features = copy(self.selected_features)
-
         # Add forced features
         if self.forced_features is None:
             self.forced_features = [feature for feature in dataset.features if dataset.roles[feature].force_input]
 
-        return dataset[:, set(selected_features + self.forced_features)]
+        return dataset[:, self.selected_features]
 
     def map_raw_feature_importances(self, raw_importances: Series):
         """Calculate input feature importances.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "LightAutoML"
-version = "0.4.0"
+version = "0.4.1.dev2"
 description = "Fast and customizable framework for automatic ML model creation (AutoML)"
 authors = [
     "Alexander Ryzhkov <[email protected]>",