Skip to content

Commit 694a9b0

Browse files
authored
Split graph folder (#4998)
This is a step toward making our export script simpler and enable two way merge in the long run.
1 parent e6253f4 commit 694a9b0

File tree

93 files changed

+420
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+420
-354
lines changed

cmake/cpp.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ foreach(SUBPROJECT IN ITEMS
645645
base
646646
init
647647
algorithms
648+
graph_base
648649
graph
649650
constraint_solver
650651
linear_solver

examples/cpp/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ cc_binary(
254254
srcs = ["jobshop_sat.cc"],
255255
deps = [
256256
"//ortools/base",
257-
"//ortools/graph:connected_components",
257+
"//ortools/graph_base:connected_components",
258258
"//ortools/sat:cp_model",
259259
"//ortools/sat:cp_model_cc_proto",
260260
"//ortools/sat:cp_model_solver",
@@ -418,8 +418,8 @@ cc_binary(
418418
srcs = ["network_routing_sat.cc"],
419419
deps = [
420420
"//ortools/base",
421-
"//ortools/graph",
422421
"//ortools/graph:shortest_paths",
422+
"//ortools/graph_base:graph",
423423
"//ortools/sat:cp_model",
424424
"//ortools/sat:model",
425425
"//ortools/util:sorted_interval_list",
@@ -676,8 +676,8 @@ cc_binary(
676676
"//ortools/algorithms:hungarian",
677677
"//ortools/base",
678678
"//ortools/base:timer",
679-
"//ortools/graph",
680679
"//ortools/graph:linear_assignment",
680+
"//ortools/graph_base:graph",
681681
"@abseil-cpp//absl/container:flat_hash_map",
682682
"@abseil-cpp//absl/flags:flag",
683683
"@abseil-cpp//absl/strings:string_view",
@@ -749,8 +749,8 @@ cc_binary(
749749
srcs = ["linear_assignment_api.cc"],
750750
deps = [
751751
"//ortools/base",
752-
"//ortools/graph",
753752
"//ortools/graph:linear_assignment",
753+
"//ortools/graph_base:graph",
754754
],
755755
)
756756

@@ -767,9 +767,9 @@ cc_binary(
767767
srcs = ["flow_api.cc"],
768768
deps = [
769769
"//ortools/base",
770-
"//ortools/graph",
771770
"//ortools/graph:generic_max_flow",
772771
"//ortools/graph:min_cost_flow",
772+
"//ortools/graph_base:graph",
773773
],
774774
)
775775

@@ -785,8 +785,8 @@ cc_binary(
785785
srcs = ["max_flow.cc"],
786786
deps = [
787787
"//ortools/base",
788-
"//ortools/graph",
789788
"//ortools/graph:generic_max_flow",
789+
"//ortools/graph_base:graph",
790790
"@abseil-cpp//absl/base:log_severity",
791791
"@abseil-cpp//absl/log",
792792
"@abseil-cpp//absl/log:globals",

examples/cpp/dimacs_assignment.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "ortools/base/init_google.h"
2828
#include "ortools/base/logging.h"
2929
#include "ortools/base/timer.h"
30-
#include "ortools/graph/graph.h"
3130
#include "ortools/graph/linear_assignment.h"
31+
#include "ortools/graph_base/graph.h"
3232

3333
ABSL_FLAG(bool, assignment_compare_hungarian, false,
3434
"Compare result and speed against Hungarian method.");

examples/cpp/flow_api.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "ortools/base/init_google.h"
1717
#include "ortools/base/logging.h"
1818
#include "ortools/graph/generic_max_flow.h"
19-
#include "ortools/graph/graph.h"
2019
#include "ortools/graph/min_cost_flow.h"
20+
#include "ortools/graph_base/graph.h"
2121

2222
namespace operations_research {
2323

examples/cpp/jobshop_sat.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "google/protobuf/text_format.h"
3131
#include "google/protobuf/wrappers.pb.h"
3232
#include "ortools/base/init_google.h"
33-
#include "ortools/graph/connected_components.h"
33+
#include "ortools/graph_base/connected_components.h"
3434
#include "ortools/sat/cp_model.h"
3535
#include "ortools/sat/cp_model.pb.h"
3636
#include "ortools/sat/cp_model_solver.h"

examples/cpp/linear_assignment_api.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
#include "ortools/base/init_google.h"
1919
#include "ortools/base/logging.h"
20-
#include "ortools/graph/graph.h"
2120
#include "ortools/graph/linear_assignment.h"
21+
#include "ortools/graph_base/graph.h"
2222

2323
namespace operations_research {
2424

examples/cpp/max_flow.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "absl/log/log.h"
2121
#include "ortools/base/init_google.h"
2222
#include "ortools/graph/generic_max_flow.h"
23-
#include "ortools/graph/graph.h"
23+
#include "ortools/graph_base/graph.h"
2424

2525
namespace operations_research {
2626

examples/cpp/network_routing_sat.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
#include "absl/strings/str_format.h"
4747
#include "absl/strings/string_view.h"
4848
#include "ortools/base/init_google.h"
49-
#include "ortools/graph/graph.h"
5049
#include "ortools/graph/shortest_paths.h"
50+
#include "ortools/graph_base/graph.h"
5151
#include "ortools/sat/cp_model.h"
5252
#include "ortools/sat/model.h"
5353
#include "ortools/util/sorted_interval_list.h"

ortools/algorithms/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@ cc_library(
325325
":dynamic_permutation",
326326
":sparse_permutation",
327327
"//ortools/base:murmur",
328-
"//ortools/graph",
329-
"//ortools/graph:iterators",
330-
"//ortools/graph:util",
328+
"//ortools/graph_base:graph",
329+
"//ortools/graph_base:iterators",
330+
"//ortools/graph_base:util",
331331
"//ortools/util:stats",
332332
"//ortools/util:time_limit",
333333
"@abseil-cpp//absl/algorithm:container",
@@ -359,9 +359,9 @@ cc_test(
359359
"//ortools/base:gmock_main",
360360
"//ortools/base:map_util",
361361
"//ortools/base:path",
362-
"//ortools/graph:io",
363-
"//ortools/graph:random_graph",
364-
"//ortools/graph:util",
362+
"//ortools/graph_base:io",
363+
"//ortools/graph_base:random_graph",
364+
"//ortools/graph_base:util",
365365
"@abseil-cpp//absl/numeric:bits",
366366
"@abseil-cpp//absl/random",
367367
"@abseil-cpp//absl/random:distributions",

ortools/algorithms/find_graph_symmetries.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@
4040
#include "ortools/algorithms/dynamic_partition.h"
4141
#include "ortools/algorithms/dynamic_permutation.h"
4242
#include "ortools/algorithms/sparse_permutation.h"
43-
#include "ortools/graph/graph.h"
44-
#include "ortools/graph/iterators.h"
45-
#include "ortools/graph/util.h"
43+
#include "ortools/graph_base/graph.h"
44+
#include "ortools/graph_base/iterators.h"
45+
#include "ortools/graph_base/util.h"
4646

4747
ABSL_FLAG(bool, minimize_permutation_support_size, false,
4848
"Tweak the algorithm to try and minimize the support size"

0 commit comments

Comments
 (0)