From f90d78f8026c6ed7594d8ee4f0b4745a08cc16e5 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Fri, 22 Jan 2021 07:42:28 -0600 Subject: [PATCH] Move tests to separate folder --- {miplearn/tests => tests}/__init__.py | 0 {miplearn/classifiers/tests => tests/classifiers}/__init__.py | 0 .../classifiers/tests => tests/classifiers}/test_counting.py | 0 {miplearn/classifiers/tests => tests/classifiers}/test_cv.py | 0 .../classifiers/tests => tests/classifiers}/test_evaluator.py | 0 .../classifiers/tests => tests/classifiers}/test_threshold.py | 0 {miplearn/components/tests => tests/components}/__init__.py | 0 .../steps/tests => tests/components/steps}/__init__.py | 0 .../tests => tests/components/steps}/test_convert_tight.py | 0 .../tests => tests/components/steps}/test_drop_redundant.py | 0 .../components/tests => tests/components}/test_composite.py | 0 .../components/tests => tests/components}/test_lazy_dynamic.py | 2 +- .../components/tests => tests/components}/test_lazy_static.py | 0 .../components/tests => tests/components}/test_objective.py | 2 +- {miplearn/components/tests => tests/components}/test_primal.py | 2 +- {miplearn/problems/tests => tests/problems}/__init__.py | 0 {miplearn/problems/tests => tests/problems}/test_knapsack.py | 0 {miplearn/problems/tests => tests/problems}/test_stab.py | 0 {miplearn/problems/tests => tests/problems}/test_tsp.py | 0 {miplearn/solvers/tests => tests/solvers}/__init__.py | 0 .../solvers/tests => tests/solvers}/test_internal_solver.py | 2 +- {miplearn/solvers/tests => tests/solvers}/test_lazy_cb.py | 2 +- .../solvers/tests => tests/solvers}/test_learning_solver.py | 2 +- {miplearn/tests => tests}/test_benchmark.py | 0 {miplearn/tests => tests}/test_extractors.py | 0 25 files changed, 6 insertions(+), 6 deletions(-) rename {miplearn/tests => tests}/__init__.py (100%) rename {miplearn/classifiers/tests => tests/classifiers}/__init__.py (100%) rename {miplearn/classifiers/tests => tests/classifiers}/test_counting.py (100%) rename {miplearn/classifiers/tests => tests/classifiers}/test_cv.py (100%) rename {miplearn/classifiers/tests => tests/classifiers}/test_evaluator.py (100%) rename {miplearn/classifiers/tests => tests/classifiers}/test_threshold.py (100%) rename {miplearn/components/tests => tests/components}/__init__.py (100%) rename {miplearn/components/steps/tests => tests/components/steps}/__init__.py (100%) rename {miplearn/components/steps/tests => tests/components/steps}/test_convert_tight.py (100%) rename {miplearn/components/steps/tests => tests/components/steps}/test_drop_redundant.py (100%) rename {miplearn/components/tests => tests/components}/test_composite.py (100%) rename {miplearn/components/tests => tests/components}/test_lazy_dynamic.py (99%) rename {miplearn/components/tests => tests/components}/test_lazy_static.py (100%) rename {miplearn/components/tests => tests/components}/test_objective.py (96%) rename {miplearn/components/tests => tests/components}/test_primal.py (98%) rename {miplearn/problems/tests => tests/problems}/__init__.py (100%) rename {miplearn/problems/tests => tests/problems}/test_knapsack.py (100%) rename {miplearn/problems/tests => tests/problems}/test_stab.py (100%) rename {miplearn/problems/tests => tests/problems}/test_tsp.py (100%) rename {miplearn/solvers/tests => tests/solvers}/__init__.py (100%) rename {miplearn/solvers/tests => tests/solvers}/test_internal_solver.py (99%) rename {miplearn/solvers/tests => tests/solvers}/test_lazy_cb.py (93%) rename {miplearn/solvers/tests => tests/solvers}/test_learning_solver.py (98%) rename {miplearn/tests => tests}/test_benchmark.py (100%) rename {miplearn/tests => tests}/test_extractors.py (100%) diff --git a/miplearn/tests/__init__.py b/tests/__init__.py similarity index 100% rename from miplearn/tests/__init__.py rename to tests/__init__.py diff --git a/miplearn/classifiers/tests/__init__.py b/tests/classifiers/__init__.py similarity index 100% rename from miplearn/classifiers/tests/__init__.py rename to tests/classifiers/__init__.py diff --git a/miplearn/classifiers/tests/test_counting.py b/tests/classifiers/test_counting.py similarity index 100% rename from miplearn/classifiers/tests/test_counting.py rename to tests/classifiers/test_counting.py diff --git a/miplearn/classifiers/tests/test_cv.py b/tests/classifiers/test_cv.py similarity index 100% rename from miplearn/classifiers/tests/test_cv.py rename to tests/classifiers/test_cv.py diff --git a/miplearn/classifiers/tests/test_evaluator.py b/tests/classifiers/test_evaluator.py similarity index 100% rename from miplearn/classifiers/tests/test_evaluator.py rename to tests/classifiers/test_evaluator.py diff --git a/miplearn/classifiers/tests/test_threshold.py b/tests/classifiers/test_threshold.py similarity index 100% rename from miplearn/classifiers/tests/test_threshold.py rename to tests/classifiers/test_threshold.py diff --git a/miplearn/components/tests/__init__.py b/tests/components/__init__.py similarity index 100% rename from miplearn/components/tests/__init__.py rename to tests/components/__init__.py diff --git a/miplearn/components/steps/tests/__init__.py b/tests/components/steps/__init__.py similarity index 100% rename from miplearn/components/steps/tests/__init__.py rename to tests/components/steps/__init__.py diff --git a/miplearn/components/steps/tests/test_convert_tight.py b/tests/components/steps/test_convert_tight.py similarity index 100% rename from miplearn/components/steps/tests/test_convert_tight.py rename to tests/components/steps/test_convert_tight.py diff --git a/miplearn/components/steps/tests/test_drop_redundant.py b/tests/components/steps/test_drop_redundant.py similarity index 100% rename from miplearn/components/steps/tests/test_drop_redundant.py rename to tests/components/steps/test_drop_redundant.py diff --git a/miplearn/components/tests/test_composite.py b/tests/components/test_composite.py similarity index 100% rename from miplearn/components/tests/test_composite.py rename to tests/components/test_composite.py diff --git a/miplearn/components/tests/test_lazy_dynamic.py b/tests/components/test_lazy_dynamic.py similarity index 99% rename from miplearn/components/tests/test_lazy_dynamic.py rename to tests/components/test_lazy_dynamic.py index 6e6491b..c7bf3ad 100644 --- a/miplearn/components/tests/test_lazy_dynamic.py +++ b/tests/components/test_lazy_dynamic.py @@ -11,7 +11,7 @@ from miplearn.classifiers import Classifier from miplearn.components.lazy_dynamic import DynamicLazyConstraintsComponent from miplearn.solvers.internal import InternalSolver from miplearn.solvers.learning import LearningSolver -from miplearn.tests import get_test_pyomo_instances +from .. import get_test_pyomo_instances E = 0.1 diff --git a/miplearn/components/tests/test_lazy_static.py b/tests/components/test_lazy_static.py similarity index 100% rename from miplearn/components/tests/test_lazy_static.py rename to tests/components/test_lazy_static.py diff --git a/miplearn/components/tests/test_objective.py b/tests/components/test_objective.py similarity index 96% rename from miplearn/components/tests/test_objective.py rename to tests/components/test_objective.py index 009ad8b..de6ca7b 100644 --- a/miplearn/components/tests/test_objective.py +++ b/tests/components/test_objective.py @@ -8,7 +8,7 @@ import numpy as np from miplearn.classifiers import Regressor from miplearn.components.objective import ObjectiveValueComponent -from miplearn.tests import get_test_pyomo_instances +from .. import get_test_pyomo_instances def test_usage(): diff --git a/miplearn/components/tests/test_primal.py b/tests/components/test_primal.py similarity index 98% rename from miplearn/components/tests/test_primal.py rename to tests/components/test_primal.py index 6585d29..10d372e 100644 --- a/miplearn/components/tests/test_primal.py +++ b/tests/components/test_primal.py @@ -8,7 +8,7 @@ import numpy as np from miplearn.classifiers import Classifier from miplearn.components.primal import PrimalSolutionComponent -from miplearn.tests import get_test_pyomo_instances +from .. import get_test_pyomo_instances def test_predict(): diff --git a/miplearn/problems/tests/__init__.py b/tests/problems/__init__.py similarity index 100% rename from miplearn/problems/tests/__init__.py rename to tests/problems/__init__.py diff --git a/miplearn/problems/tests/test_knapsack.py b/tests/problems/test_knapsack.py similarity index 100% rename from miplearn/problems/tests/test_knapsack.py rename to tests/problems/test_knapsack.py diff --git a/miplearn/problems/tests/test_stab.py b/tests/problems/test_stab.py similarity index 100% rename from miplearn/problems/tests/test_stab.py rename to tests/problems/test_stab.py diff --git a/miplearn/problems/tests/test_tsp.py b/tests/problems/test_tsp.py similarity index 100% rename from miplearn/problems/tests/test_tsp.py rename to tests/problems/test_tsp.py diff --git a/miplearn/solvers/tests/__init__.py b/tests/solvers/__init__.py similarity index 100% rename from miplearn/solvers/tests/__init__.py rename to tests/solvers/__init__.py diff --git a/miplearn/solvers/tests/test_internal_solver.py b/tests/solvers/test_internal_solver.py similarity index 99% rename from miplearn/solvers/tests/test_internal_solver.py rename to tests/solvers/test_internal_solver.py index 68be925..47f9dca 100644 --- a/miplearn/solvers/tests/test_internal_solver.py +++ b/tests/solvers/test_internal_solver.py @@ -11,7 +11,7 @@ import pyomo.environ as pe from miplearn.solvers import _RedirectOutput from miplearn.solvers.gurobi import GurobiSolver from miplearn.solvers.pyomo.base import BasePyomoSolver -from miplearn.solvers.tests import ( +from . import ( _get_knapsack_instance, _get_internal_solvers, _get_infeasible_instance, diff --git a/miplearn/solvers/tests/test_lazy_cb.py b/tests/solvers/test_lazy_cb.py similarity index 93% rename from miplearn/solvers/tests/test_lazy_cb.py rename to tests/solvers/test_lazy_cb.py index 9fb2ad0..a62c872 100644 --- a/miplearn/solvers/tests/test_lazy_cb.py +++ b/tests/solvers/test_lazy_cb.py @@ -5,7 +5,7 @@ import logging from miplearn.solvers.gurobi import GurobiSolver -from miplearn.solvers.tests import _get_knapsack_instance +from . import _get_knapsack_instance logger = logging.getLogger(__name__) diff --git a/miplearn/solvers/tests/test_learning_solver.py b/tests/solvers/test_learning_solver.py similarity index 98% rename from miplearn/solvers/tests/test_learning_solver.py rename to tests/solvers/test_learning_solver.py index b5b1838..983c1d1 100644 --- a/miplearn/solvers/tests/test_learning_solver.py +++ b/tests/solvers/test_learning_solver.py @@ -9,7 +9,7 @@ import os from miplearn.solvers.gurobi import GurobiSolver from miplearn.solvers.learning import LearningSolver -from miplearn.solvers.tests import _get_knapsack_instance, _get_internal_solvers +from . import _get_knapsack_instance, _get_internal_solvers logger = logging.getLogger(__name__) diff --git a/miplearn/tests/test_benchmark.py b/tests/test_benchmark.py similarity index 100% rename from miplearn/tests/test_benchmark.py rename to tests/test_benchmark.py diff --git a/miplearn/tests/test_extractors.py b/tests/test_extractors.py similarity index 100% rename from miplearn/tests/test_extractors.py rename to tests/test_extractors.py