Add static_ prefix to all static features

This commit is contained in:
2021-08-04 13:35:16 -05:00
parent 10eed9b306
commit ca925119b3
10 changed files with 82 additions and 79 deletions

View File

@@ -25,13 +25,13 @@ def training_instances() -> List[Instance]:
MemorySample(
{
"lazy_enforced": {"c1", "c2"},
"instance_features": [5.0],
"static_instance_features": [5.0],
},
),
MemorySample(
{
"lazy_enforced": {"c2", "c3"},
"instance_features": [5.0],
"static_instance_features": [5.0],
},
),
]
@@ -56,7 +56,7 @@ def training_instances() -> List[Instance]:
MemorySample(
{
"lazy_enforced": {"c3", "c4"},
"instance_features": [8.0],
"static_instance_features": [8.0],
},
)
]

View File

@@ -22,11 +22,11 @@ from miplearn.solvers.tests import assert_equals
def sample() -> Sample:
sample = MemorySample(
{
"var_names": ["x[0]", "x[1]", "x[2]", "x[3]"],
"var_categories": ["default", None, "default", "default"],
"static_var_names": ["x[0]", "x[1]", "x[2]", "x[3]"],
"static_var_categories": ["default", None, "default", "default"],
"mip_var_values": [0.0, 1.0, 1.0, 0.0],
"instance_features": [5.0],
"var_features": [
"static_instance_features": [5.0],
"static_var_features": [
[0.0, 0.0],
None,
[1.0, 0.0],

View File

@@ -24,16 +24,16 @@ from miplearn.types import (
def sample() -> Sample:
sample = MemorySample(
{
"constr_categories": [
"static_constr_categories": [
"type-a",
"type-a",
"type-a",
"type-b",
"type-b",
],
"constr_lazy": [True, True, True, True, False],
"constr_names": ["c1", "c2", "c3", "c4", "c5"],
"instance_features": [5.0],
"static_constr_lazy": [True, True, True, True, False],
"static_constr_names": ["c1", "c2", "c3", "c4", "c5"],
"static_instance_features": [5.0],
"lazy_enforced": {"c1", "c2", "c4"},
"lp_constr_features": [
[1.0, 1.0],
@@ -42,7 +42,7 @@ def sample() -> Sample:
[1.0, 4.0, 0.0],
None,
],
"static_lazy_count": 4,
"static_constr_lazy_count": 4,
},
)
return sample