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 (

tests/fixtures/infeasible.py

@@ -6,7 +6,7 @@ from typing import Any
 
 from pyomo import environ as pe
 
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.pyomo.base import BasePyomoSolver
 from tests.solvers import _is_subclass_or_instance

tests/fixtures/knapsack.py

@@ -1,7 +1,7 @@
 #  MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
 #  Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
 #  Released under the modified BSD license. See COPYING.md for more details.
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.problems.knapsack import KnapsackInstance, GurobiKnapsackInstance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.internal import InternalSolver

tests/fixtures/redundant.py

@@ -5,7 +5,7 @@ from typing import Any
 
 import pyomo.environ as pe
 
-from miplearn.instance import Instance
+from miplearn.instance.base import Instance
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.pyomo.base import BasePyomoSolver
 from tests.solvers import _is_subclass_or_instance

tests/instance/__init__.py

@@ -0,0 +1,3 @@
+#  MIPLearn: Extensible Framework for Learning-Enhanced Mixed-Integer Optimization
+#  Copyright (C) 2020-2021, UChicago Argonne, LLC. All rights reserved.
+#  Released under the modified BSD license. See COPYING.md for more details.

tests/instance/test_picklegz.py

@@ -3,12 +3,12 @@
 #  Released under the modified BSD license. See COPYING.md for more details.
 import tempfile
 
-from miplearn.instance import write_pickle_gz, PickleGzInstance
+from miplearn.instance.picklegz import write_pickle_gz, PickleGzInstance
 from miplearn.solvers.gurobi import GurobiSolver
 from tests.fixtures.knapsack import get_knapsack_instance
 
 
-def test_pickled() -> None:
+def test_usage() -> None:
     original = get_knapsack_instance(GurobiSolver())
     file = tempfile.NamedTemporaryFile()
     write_pickle_gz(original, file.name)

tests/solvers/test_learning_solver.py

@@ -8,7 +8,7 @@ import tempfile
 
 import dill
 
-from miplearn.instance import PickleGzInstance, write_pickle_gz, read_pickle_gz
+from miplearn.instance.picklegz import PickleGzInstance, write_pickle_gz, read_pickle_gz
 from miplearn.solvers.gurobi import GurobiSolver
 from miplearn.solvers.learning import LearningSolver
 from . import _get_knapsack_instance, get_internal_solvers