Reorganize instance package

miplearn/solvers/gurobi.py

@@ -8,7 +8,7 @@ from io import StringIO
 from random import randint
 from typing import List, Any, Dict, Optional, cast, Tuple, Union
 
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers import _RedirectOutput
 from miplearn.solvers.internal import (
     InternalSolver,

miplearn/solvers/internal.py

@@ -6,7 +6,7 @@ import logging
 from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
 
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.types import (
     LPSolveStats,
     IterationCallback,

miplearn/solvers/learning.py

@@ -14,7 +14,8 @@ from miplearn.components.dynamic_user_cuts import UserCutsComponent
 from miplearn.components.objective import ObjectiveValueComponent
 from miplearn.components.primal import PrimalSolutionComponent
 from miplearn.features import FeaturesExtractor, TrainingSample
-from miplearn.instance import Instance, PickleGzInstance
+from miplearn.instance.base import Instance
+from miplearn.instance.picklegz import PickleGzInstance
 from miplearn.solvers import _RedirectOutput
 from miplearn.solvers.internal import InternalSolver
 from miplearn.solvers.pyomo.gurobi import GurobiPyomoSolver

miplearn/solvers/pyomo/base.py

@@ -14,7 +14,7 @@ from pyomo.core import Var, Constraint
 from pyomo.opt import TerminationCondition
 from pyomo.opt.base.solvers import SolverFactory
 
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers import _RedirectOutput
 from miplearn.solvers.internal import (
     InternalSolver,