Replace individual constraint methods by single get_constraints

This commit is contained in:
2021-04-09 21:51:38 -05:00
parent 626d75f25e
commit 9368b37139
9 changed files with 156 additions and 159 deletions

View File

@@ -14,8 +14,8 @@ from miplearn.components.static_lazy import StaticLazyConstraintsComponent
from miplearn.features import (
TrainingSample,
InstanceFeatures,
ConstraintFeatures,
Features,
Constraint,
)
from miplearn.instance.base import Instance
from miplearn.solvers.internal import InternalSolver
@@ -48,27 +48,27 @@ def features() -> Features:
lazy_constraint_count=4,
),
constraints={
"c1": ConstraintFeatures(
"c1": Constraint(
category="type-a",
user_features=[1.0, 1.0],
lazy=True,
),
"c2": ConstraintFeatures(
"c2": Constraint(
category="type-a",
user_features=[1.0, 2.0],
lazy=True,
),
"c3": ConstraintFeatures(
"c3": Constraint(
category="type-a",
user_features=[1.0, 3.0],
lazy=True,
),
"c4": ConstraintFeatures(
"c4": Constraint(
category="type-b",
user_features=[1.0, 4.0, 0.0],
lazy=True,
),
"c5": ConstraintFeatures(
"c5": Constraint(
category="type-b",
user_features=[1.0, 5.0, 0.0],
lazy=False,

View File

@@ -6,7 +6,7 @@ from miplearn.features import (
FeaturesExtractor,
InstanceFeatures,
VariableFeatures,
ConstraintFeatures,
Constraint,
)
from miplearn.solvers.gurobi import GurobiSolver
@@ -37,7 +37,7 @@ def test_knapsack() -> None:
),
}
assert instance.features.constraints == {
"eq_capacity": ConstraintFeatures(
"eq_capacity": Constraint(
lhs={
"x[0]": 23.0,
"x[1]": 26.0,