Skip to content

Commit 5341fee

Browse files
committed
[CP-SAT] add experimental routing constraint; more no_overlap_2d presolve; add random_half branching heuristics
1 parent a7d56e6 commit 5341fee

21 files changed

+611
-302
lines changed

ortools/sat/BUILD.bazel

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ cc_library(
433433
"@com_google_absl//absl/container:flat_hash_map",
434434
"@com_google_absl//absl/container:flat_hash_set",
435435
"@com_google_absl//absl/log:check",
436+
"@com_google_absl//absl/random:bit_gen_ref",
436437
"@com_google_absl//absl/random:distributions",
437438
"@com_google_absl//absl/strings",
438439
"@com_google_absl//absl/types:span",
@@ -450,6 +451,10 @@ cc_test(
450451
":sat_parameters_cc_proto",
451452
"//ortools/base:gmock_main",
452453
"//ortools/base:parse_test_proto",
454+
"//ortools/util:stats",
455+
"@com_google_absl//absl/container:flat_hash_map",
456+
"@com_google_absl//absl/log",
457+
"@com_google_absl//absl/strings",
453458
],
454459
)
455460

@@ -592,6 +597,7 @@ cc_library(
592597
":cp_model_symmetries",
593598
":cp_model_utils",
594599
":cuts",
600+
":diffn_util",
595601
":feasibility_jump",
596602
":feasibility_pump",
597603
":implied_bounds",
@@ -2028,7 +2034,9 @@ cc_library(
20282034
"//ortools/graph:strongly_connected_components",
20292035
"//ortools/util:sort",
20302036
"//ortools/util:strong_integers",
2037+
"@com_google_absl//absl/algorithm:container",
20312038
"@com_google_absl//absl/container:btree",
2039+
"@com_google_absl//absl/container:flat_hash_map",
20322040
"@com_google_absl//absl/log:check",
20332041
"@com_google_absl//absl/types:span",
20342042
],
@@ -3350,6 +3358,7 @@ cc_library(
33503358
srcs = ["circuit.cc"],
33513359
hdrs = ["circuit.h"],
33523360
deps = [
3361+
":all_different",
33533362
":clause",
33543363
":integer",
33553364
":model",

0 commit comments

Comments
 (0)