Skip to content

Commit

Permalink
Merge pull request #39 from TobyBoyne/master
Browse files Browse the repository at this point in the history
Disable some pipeline tests
  • Loading branch information
TobyBoyne authored Jun 26, 2024
2 parents 5d7003d + 575bb23 commit c7737b1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion entmoot/optimizers/gurobi_opt.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def solve(
model_core: gur.Model = None,
weights: tuple = None,
use_env: bool = False,
) -> namedtuple:
) -> OptResult:
"""
Solves the Gurobi optimization model
"""
Expand Down
7 changes: 4 additions & 3 deletions tests/test_curr.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import numpy as np
import pytest
import random
import pyomo.environ # noqa: F401

@pytest.mark.pipeline_test
def test_core_model_copy():
Expand All @@ -32,7 +33,7 @@ def test_core_model_copy():
assert len(core_model_pyomo._all_feat) == len(core_model_pyomo_copy._all_feat)


@pytest.mark.pipeline_test
# @pytest.mark.pipeline_test
def test_multiobj_constraints():
# define problem
problem_config = ProblemConfig(rnd_seed=73)
Expand Down Expand Up @@ -98,7 +99,7 @@ def test_multiobj_constraints():
assert round(x_opt, 5) == round(y_opt, 5) and round(y_opt, 5) == round(z_opt, 5)


@pytest.mark.pipeline_test
# @pytest.mark.pipeline_test
def test_simple_test():
def my_func(x: float) -> float:
return x**2 + 1 + random.uniform(-0.2, 0.2)
Expand Down Expand Up @@ -172,7 +173,7 @@ def test_compare_pyomo_gurobipy_multiobj():
assert math.isclose(res_gur.opt_val, res_pyo.opt_val, abs_tol=0.01)


@pytest.mark.pipeline_test
# @pytest.mark.pipeline_test
def test_compare_pyomo_gurobipy_singleobj():
"""
Ensures for a single objective example with l1 and l2 uncertainty metric and mixed feature types that optimization
Expand Down

0 comments on commit c7737b1

Please sign in to comment.