Skip to content

Commit 75d10ed

Browse files
committed
[CP-SAT] work on lrat; probing; variable encoding
1 parent 8e281f8 commit 75d10ed

26 files changed

+1812
-1213
lines changed

ortools/sat/BUILD.bazel

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,6 +1197,26 @@ cc_test(
11971197
],
11981198
)
11991199

1200+
cc_library(
1201+
name = "variable_expand",
1202+
srcs = ["variable_expand.cc"],
1203+
hdrs = ["variable_expand.h"],
1204+
deps = [
1205+
":cp_model_utils",
1206+
":presolve_context",
1207+
":solution_crush",
1208+
"//ortools/base:stl_util",
1209+
"//ortools/util:saturated_arithmetic",
1210+
"//ortools/util:sorted_interval_list",
1211+
"@abseil-cpp//absl/algorithm:container",
1212+
"@abseil-cpp//absl/container:btree",
1213+
"@abseil-cpp//absl/container:flat_hash_set",
1214+
"@abseil-cpp//absl/log",
1215+
"@abseil-cpp//absl/log:check",
1216+
"@abseil-cpp//absl/strings",
1217+
],
1218+
)
1219+
12001220
cc_library(
12011221
name = "cp_model_presolve",
12021222
srcs = [
@@ -1232,6 +1252,7 @@ cc_library(
12321252
":solution_crush",
12331253
":util",
12341254
":var_domination",
1255+
":variable_expand",
12351256
"//ortools/base",
12361257
"//ortools/base:mathutil",
12371258
"//ortools/base:protobuf_util",
@@ -1470,6 +1491,7 @@ cc_library(
14701491
"//ortools/util:stats",
14711492
"//ortools/util:strong_integers",
14721493
"//ortools/util:time_limit",
1494+
"@abseil-cpp//absl/algorithm:container",
14731495
"@abseil-cpp//absl/base:core_headers",
14741496
"@abseil-cpp//absl/container:btree",
14751497
"@abseil-cpp//absl/container:flat_hash_map",
@@ -1539,6 +1561,8 @@ cc_library(
15391561
"//ortools/util:strong_integers",
15401562
"//ortools/util:time_limit",
15411563
"@abseil-cpp//absl/container:btree",
1564+
"@abseil-cpp//absl/container:flat_hash_map",
1565+
"@abseil-cpp//absl/container:inlined_vector",
15421566
"@abseil-cpp//absl/log",
15431567
"@abseil-cpp//absl/log:check",
15441568
"@abseil-cpp//absl/log:vlog_is_on",
@@ -3428,6 +3452,7 @@ cc_library(
34283452
srcs = ["stat_tables.cc"],
34293453
hdrs = ["stat_tables.h"],
34303454
deps = [
3455+
":clause",
34313456
":cp_model_cc_proto",
34323457
":linear_programming_constraint",
34333458
":model",
@@ -3442,6 +3467,7 @@ cc_library(
34423467
"@abseil-cpp//absl/strings",
34433468
"@abseil-cpp//absl/strings:str_format",
34443469
"@abseil-cpp//absl/synchronization",
3470+
"@abseil-cpp//absl/types:span",
34453471
],
34463472
)
34473473

@@ -4245,6 +4271,7 @@ cc_library(
42454271
":sat_base",
42464272
":synchronization",
42474273
":util",
4274+
"//ortools/util:bitset",
42484275
"@abseil-cpp//absl/algorithm:container",
42494276
"@abseil-cpp//absl/container:flat_hash_map",
42504277
"@abseil-cpp//absl/container:flat_hash_set",

0 commit comments

Comments
 (0)