ANL-CEEESA/MIPLearn
1
0
Fork 0
mirror of https://github.com/ANL-CEEESA/MIPLearn.git synced 2025-12-06 01:18:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add more variable features

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-04-10 18:29:38 -05:00
parent 5e1f26e4b0
commit 733c8299e0
8 changed files with 331 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
tests/components/test_primal.py
View File

@@ -12,7 +12,7 @@ from miplearn.classifiers import Classifier
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.features import TrainingSample, Variable, Features
from miplearn.instance.base import Instance
from miplearn.problems.tsp import TravelingSalesmanGenerator
from miplearn.solvers.learning import LearningSolver
@@ -21,18 +21,18 @@ from miplearn.solvers.learning import LearningSolver
def test_xy() -> None:
features = Features(
variables={
"x[0]": VariableFeatures(
"x[0]": Variable(
category="default",
user_features=[0.0, 0.0],
),
"x[1]": VariableFeatures(
"x[1]": Variable(
category=None,
),
"x[2]": VariableFeatures(
"x[2]": Variable(
category="default",
user_features=[1.0, 0.0],
),
"x[3]": VariableFeatures(
"x[3]": Variable(
category="default",
user_features=[1.0, 1.0],
),
@@ -78,18 +78,18 @@ def test_xy() -> None:
def test_xy_without_lp_solution() -> None:
features = Features(
variables={
"x[0]": VariableFeatures(
"x[0]": Variable(
category="default",
user_features=[0.0, 0.0],
),
"x[1]": VariableFeatures(
"x[1]": Variable(
category=None,
),
"x[2]": VariableFeatures(
"x[2]": Variable(
category="default",
user_features=[1.0, 0.0],
),
"x[3]": VariableFeatures(
"x[3]": Variable(
category="default",
user_features=[1.0, 1.0],
),
@@ -141,15 +141,15 @@ def test_predict() -> None:
thr.predict = Mock(return_value=[0.75, 0.75])
features = Features(
variables={
"x[0]": VariableFeatures(
"x[0]": Variable(
category="default",
user_features=[0.0, 0.0],
),
"x[1]": VariableFeatures(
"x[1]": Variable(
category="default",
user_features=[0.0, 2.0],
),
"x[2]": VariableFeatures(
"x[2]": Variable(
category="default",
user_features=[2.0, 0.0],
),
@@ -235,11 +235,11 @@ def test_evaluate() -> None:
}
features: Features = Features(
variables={
"x[0]": VariableFeatures(),
"x[1]": VariableFeatures(),
"x[2]": VariableFeatures(),
"x[3]": VariableFeatures(),
"x[4]": VariableFeatures(),
"x[0]": Variable(),
"x[1]": Variable(),
"x[2]": Variable(),
"x[3]": Variable(),
"x[4]": Variable(),
}
)
instance = Mock(spec=Instance)

10
tests/test_features.py
View File

@@ -5,7 +5,7 @@
from miplearn.features import (
FeaturesExtractor,
InstanceFeatures,
VariableFeatures,
Variable,
Constraint,
)
from miplearn.solvers.gurobi import GurobiSolver
@@ -19,19 +19,19 @@ def test_knapsack() -> None:
solver.set_instance(instance, model)
FeaturesExtractor(solver).extract(instance)
assert instance.features.variables == {
"x[0]": VariableFeatures(
"x[0]": Variable(
category="default",
user_features=[23.0, 505.0],
),
"x[1]": VariableFeatures(
"x[1]": Variable(
category="default",
user_features=[26.0, 352.0],
),
"x[2]": VariableFeatures(
"x[2]": Variable(
category="default",
user_features=[20.0, 458.0],
),
"x[3]": VariableFeatures(
"x[3]": Variable(
category="default",
user_features=[18.0, 220.0],
),