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

Don't include intermediary features in sample; rename some keys

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-08-04 13:22:12 -05:00
parent 865a4b2f40
commit 10eed9b306
10 changed files with 33 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/components/test_dynamic_lazy.py
View File

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

2
tests/components/test_primal.py
View File

@@ -25,7 +25,7 @@ def sample() -> Sample:
"var_names": ["x[0]", "x[1]", "x[2]", "x[3]"],
"var_categories": ["default", None, "default", "default"],
"mip_var_values": [0.0, 1.0, 1.0, 0.0],
"instance_features_user": [5.0],
"instance_features": [5.0],
"var_features": [
[0.0, 0.0],
None,

2
tests/components/test_static_lazy.py
View File

@@ -33,7 +33,7 @@ def sample() -> Sample:
],
"constr_lazy": [True, True, True, True, False],
"constr_names": ["c1", "c2", "c3", "c4", "c5"],
"instance_features_user": [5.0],
"instance_features": [5.0],
"lazy_enforced": {"c1", "c2", "c4"},
"lp_constr_features": [
[1.0, 1.0],

28
tests/features/test_extractor.py
View File

@@ -35,20 +35,6 @@ def test_knapsack() -> None:
sample.get_vector("var_categories"),
["default", "default", "default", "default", None],
)
assert_equals(
sample.get_vector_list("var_features_user"),
[[23.0, 505.0], [26.0, 352.0], [20.0, 458.0], [18.0, 220.0], None],
)
assert_equals(
sample.get_vector_list("var_features_AlvLouWeh2017"),
[
[1.0, 0.32899, 0.0],
[1.0, 0.229316, 0.0],
[1.0, 0.298371, 0.0],
[1.0, 0.143322, 0.0],
[0.0, 0.0, 0.0],
],
)
assert sample.get_vector_list("var_features") is not None
assert_equals(sample.get_vector("constr_names"), ["eq_capacity"])
# assert_equals(
@@ -65,10 +51,10 @@ def test_knapsack() -> None:
# )
assert_equals(sample.get_vector("constr_rhs"), [0.0])
assert_equals(sample.get_vector("constr_senses"), ["="])
assert_equals(sample.get_vector("constr_features_user"), [None])
assert_equals(sample.get_vector("constr_features"), [None])
assert_equals(sample.get_vector("constr_categories"), ["eq_capacity"])
assert_equals(sample.get_vector("constr_lazy"), [False])
assert_equals(sample.get_vector("instance_features_user"), [67.0, 21.75])
assert_equals(sample.get_vector("instance_features"), [67.0, 21.75])
assert_equals(sample.get_scalar("static_lazy_count"), 0)
# after-lp
@@ -104,16 +90,6 @@ def test_knapsack() -> None:
)
assert_equals(sample.get_vector("lp_var_sa_ub_up"), [2.043478, inf, 2.2, inf, 69.0])
assert_equals(sample.get_vector("lp_var_values"), [1.0, 0.923077, 1.0, 0.0, 67.0])
assert_equals(
sample.get_vector_list("lp_var_features_AlvLouWeh2017"),
[
[1.0, 0.32899, 0.0, 0.0, 1.0, 1.0, 5.265874, 46.051702],
[1.0, 0.229316, 0.0, 0.076923, 1.0, 1.0, 3.532875, 5.388476],
[1.0, 0.298371, 0.0, 0.0, 1.0, 1.0, 5.232342, 46.051702],
[1.0, 0.143322, 0.0, 0.0, 1.0, -1.0, 46.051702, 3.16515],
[0.0, 0.0, 0.0, 0.0, 1.0, -1.0, 0.0, 0.0],
],
)
assert sample.get_vector_list("lp_var_features") is not None
assert_equals(sample.get_vector("lp_constr_basis_status"), ["N"])
assert_equals(sample.get_vector("lp_constr_dual_values"), [13.538462])

2
tests/features/test_sample.py
View File

@@ -26,7 +26,7 @@ def _test_sample(sample: Sample) -> None:
_assert_roundtrip_scalar(sample, 1.0)
# Vector
_assert_roundtrip_vector(sample, ["A", "BB", "CCC", "こんにちは", None])
_assert_roundtrip_vector(sample, ["A", "BB", "CCC", None])
_assert_roundtrip_vector(sample, [True, True, False])
_assert_roundtrip_vector(sample, [1, 2, 3])
_assert_roundtrip_vector(sample, [1.0, 2.0, 3.0])