Move feature classes to features.py

tests/components/steps/test_drop_redundant.py

@@ -12,7 +12,7 @@ from miplearn.components.steps.drop_redundant import DropRedundantInequalitiesSt
 from miplearn.instance import Instance
 from miplearn.solvers.internal import InternalSolver
 from miplearn.solvers.learning import LearningSolver
-from miplearn.types import TrainingSample, Features
+from miplearn.features import TrainingSample, Features
 from tests.fixtures.infeasible import get_infeasible_instance
 from tests.fixtures.redundant import get_instance_with_redundancy
 

tests/components/test_lazy_static.py

@@ -13,11 +13,13 @@ from miplearn.classifiers import Classifier
 from miplearn.classifiers.threshold import Threshold, MinProbabilityThreshold
 from miplearn.components.lazy_static import StaticLazyConstraintsComponent
 from miplearn.types import (
-    TrainingSample,
-    Features,
     LearningSolveStats,
+)
+from miplearn.features import (
+    TrainingSample,
     InstanceFeatures,
     ConstraintFeatures,
+    Features,
 )
 
 

tests/components/test_objective.py

@@ -9,7 +9,7 @@ from numpy.testing import assert_array_equal
 
 from miplearn import GurobiPyomoSolver, LearningSolver, Regressor
 from miplearn.components.objective import ObjectiveValueComponent
-from miplearn.types import TrainingSample, Features, InstanceFeatures
+from miplearn.features import TrainingSample, InstanceFeatures, Features
 from tests.fixtures.knapsack import get_knapsack_instance
 
 import numpy as np

tests/components/test_primal.py

@@ -13,7 +13,7 @@ from miplearn.classifiers.threshold import Threshold
 from miplearn.components import classifier_evaluation_dict
 from miplearn.components.primal import PrimalSolutionComponent
 from miplearn.problems.tsp import TravelingSalesmanGenerator
-from miplearn.types import TrainingSample, Features, VariableFeatures
+from miplearn.features import TrainingSample, VariableFeatures, Features
 
 
 def test_xy() -> None:

tests/test_features.py

@@ -3,8 +3,12 @@
 #  Released under the modified BSD license. See COPYING.md for more details.
 
 from miplearn import GurobiSolver
-from miplearn.features import FeaturesExtractor
-from miplearn.types import VariableFeatures, InstanceFeatures, ConstraintFeatures
+from miplearn.features import (
+    FeaturesExtractor,
+    InstanceFeatures,
+    VariableFeatures,
+    ConstraintFeatures,
+)
 from tests.fixtures.knapsack import get_knapsack_instance