Reorganize instance package

tests/components/steps/test_convert_tight.py

@@ -7,7 +7,7 @@ from unittest.mock import Mock
 from miplearn.classifiers import Classifier
 from miplearn.components.steps.convert_tight import ConvertTightIneqsIntoEqsStep
 from miplearn.components.steps.relax_integrality import RelaxIntegralityStep
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.problems.knapsack import GurobiKnapsackInstance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.learning import LearningSolver

tests/components/steps/test_drop_redundant.py

@@ -10,7 +10,7 @@ from miplearn.classifiers import Classifier
 from miplearn.components.steps.drop_redundant import DropRedundantInequalitiesStep
 from miplearn.components.steps.relax_integrality import RelaxIntegralityStep
 from miplearn.features import TrainingSample, Features
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.internal import InternalSolver
 from miplearn.solvers.learning import LearningSolver

tests/components/test_component.py

@@ -4,7 +4,7 @@
 from unittest.mock import Mock
 
 from miplearn.components.component import Component
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 
 
 def test_xy_instance():

tests/components/test_dynamic_lazy.py

@@ -17,7 +17,7 @@ from miplearn.features import (
     Features,
     InstanceFeatures,
 )
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 
 E = 0.1
 

tests/components/test_dynamic_user_cuts.py

@@ -12,7 +12,7 @@ from gurobipy import GRB
 from networkx import Graph
 
 from miplearn.components.dynamic_user_cuts import UserCutsComponent
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.learning import LearningSolver
 

tests/components/test_objective.py

@@ -11,7 +11,7 @@ from numpy.testing import assert_array_equal
 from miplearn.classifiers import Regressor
 from miplearn.components.objective import ObjectiveValueComponent
 from miplearn.features import TrainingSample, InstanceFeatures, Features
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.learning import LearningSolver
 from miplearn.solvers.pyomo.gurobi import GurobiPyomoSolver
 from tests.fixtures.knapsack import get_knapsack_instance

tests/components/test_primal.py

@@ -12,7 +12,7 @@ from miplearn.classifiers.threshold import Threshold
 from miplearn.components import classifier_evaluation_dict
 from miplearn.components.primal import PrimalSolutionComponent
 from miplearn.features import TrainingSample, VariableFeatures, Features
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.problems.tsp import TravelingSalesmanGenerator
 from miplearn.solvers.learning import LearningSolver
 

tests/components/test_static_lazy.py

@@ -17,7 +17,7 @@ from miplearn.features import (
     ConstraintFeatures,
     Features,
 )
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.internal import InternalSolver
 from miplearn.solvers.learning import LearningSolver
 from miplearn.types import (