diff --git a/ortools/algorithms/samples/BUILD b/ortools/algorithms/samples/BUILD index acd1168018..6acb8b5511 100644 --- a/ortools/algorithms/samples/BUILD +++ b/ortools/algorithms/samples/BUILD @@ -1,5 +1,5 @@ load(":code_samples.bzl", "code_sample_cc") -code_sample_cc(sample = "knapsack") +code_sample_cc(name = "knapsack") -code_sample_cc(sample = "simple_knapsack_program") +code_sample_cc(name = "simple_knapsack_program") diff --git a/ortools/algorithms/samples/code_samples.bzl b/ortools/algorithms/samples/code_samples.bzl index 1c98e396d2..e25d1680ac 100644 --- a/ortools/algorithms/samples/code_samples.bzl +++ b/ortools/algorithms/samples/code_samples.bzl @@ -1,18 +1,20 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/algorithms:knapsack_solver_lib", ], ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/algorithms:knapsack_solver_lib", ], ) diff --git a/ortools/constraint_solver/samples/BUILD b/ortools/constraint_solver/samples/BUILD index 3a6efc1168..07d1f163fc 100644 --- a/ortools/constraint_solver/samples/BUILD +++ b/ortools/constraint_solver/samples/BUILD @@ -1,45 +1,45 @@ load(":code_samples.bzl", "code_sample_cc") -code_sample_cc(sample = "minimal_jobshop_cp") +code_sample_cc(name = "minimal_jobshop_cp") -code_sample_cc(sample = "nurses_cp") +code_sample_cc(name = "nurses_cp") -code_sample_cc(sample = "rabbits_and_pheasants_cp") +code_sample_cc(name = "rabbits_and_pheasants_cp") -code_sample_cc(sample = "simple_cp_program") +code_sample_cc(name = "simple_cp_program") -code_sample_cc(sample = "simple_ls_program") +code_sample_cc(name = "simple_ls_program") -code_sample_cc(sample = "simple_routing_program") +code_sample_cc(name = "simple_routing_program") -code_sample_cc(sample = "tsp") +code_sample_cc(name = "tsp") -code_sample_cc(sample = "tsp_circuit_board") +code_sample_cc(name = "tsp_circuit_board") -code_sample_cc(sample = "tsp_cities") +code_sample_cc(name = "tsp_cities") -code_sample_cc(sample = "tsp_distance_matrix") +code_sample_cc(name = "tsp_distance_matrix") -code_sample_cc(sample = "vrp_capacity") +code_sample_cc(name = "vrp_capacity") -code_sample_cc(sample = "vrp") +code_sample_cc(name = "vrp") -code_sample_cc(sample = "vrp_drop_nodes") +code_sample_cc(name = "vrp_drop_nodes") -code_sample_cc(sample = "vrp_global_span") +code_sample_cc(name = "vrp_global_span") -code_sample_cc(sample = "vrp_initial_routes") +code_sample_cc(name = "vrp_initial_routes") -code_sample_cc(sample = "vrp_pickup_delivery") +code_sample_cc(name = "vrp_pickup_delivery") -code_sample_cc(sample = "vrp_pickup_delivery_fifo") +code_sample_cc(name = "vrp_pickup_delivery_fifo") -code_sample_cc(sample = "vrp_pickup_delivery_lifo") +code_sample_cc(name = "vrp_pickup_delivery_lifo") -code_sample_cc(sample = "vrp_resources") +code_sample_cc(name = "vrp_resources") -code_sample_cc(sample = "vrp_starts_ends") +code_sample_cc(name = "vrp_starts_ends") -code_sample_cc(sample = "vrp_time_windows") +code_sample_cc(name = "vrp_time_windows") -code_sample_cc(sample = "vrp_with_time_limit") +code_sample_cc(name = "vrp_with_time_limit") diff --git a/ortools/constraint_solver/samples/code_samples.bzl b/ortools/constraint_solver/samples/code_samples.bzl index 1f221eb843..6f838b54b0 100644 --- a/ortools/constraint_solver/samples/code_samples.bzl +++ b/ortools/constraint_solver/samples/code_samples.bzl @@ -1,7 +1,9 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/base", "//ortools/constraint_solver:cp", @@ -12,11 +14,11 @@ def code_sample_cc(sample): ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/base", "//ortools/constraint_solver:cp", "//ortools/constraint_solver:routing", diff --git a/ortools/glop/samples/BUILD b/ortools/glop/samples/BUILD index ec5baf73f9..7a20bcff1a 100644 --- a/ortools/glop/samples/BUILD +++ b/ortools/glop/samples/BUILD @@ -1,3 +1,3 @@ load(":code_samples.bzl", "code_sample_cc") -code_sample_cc(sample = "simple_glop_program") +code_sample_cc(name = "simple_glop_program") diff --git a/ortools/glop/samples/code_samples.bzl b/ortools/glop/samples/code_samples.bzl index bbd80e5865..96c0be7bf8 100644 --- a/ortools/glop/samples/code_samples.bzl +++ b/ortools/glop/samples/code_samples.bzl @@ -1,7 +1,9 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/base", "//ortools/glop:lp_solver", @@ -10,11 +12,11 @@ def code_sample_cc(sample): ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/base", "//ortools/glop:lp_solver", "//ortools/lp_data", diff --git a/ortools/graph/samples/BUILD b/ortools/graph/samples/BUILD index ce246ebce9..0b7f5a68bc 100644 --- a/ortools/graph/samples/BUILD +++ b/ortools/graph/samples/BUILD @@ -1,5 +1,5 @@ load(":code_samples.bzl", "code_sample_cc") -code_sample_cc(sample = "simple_max_flow_program") +code_sample_cc(name = "simple_max_flow_program") -code_sample_cc(sample = "simple_min_cost_flow_program") +code_sample_cc(name = "simple_min_cost_flow_program") diff --git a/ortools/graph/samples/code_samples.bzl b/ortools/graph/samples/code_samples.bzl index bd6f63bfaa..437ed5e7e2 100644 --- a/ortools/graph/samples/code_samples.bzl +++ b/ortools/graph/samples/code_samples.bzl @@ -1,7 +1,9 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/base", "//ortools/graph:min_cost_flow", @@ -13,11 +15,11 @@ def code_sample_cc(sample): ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/base", "//ortools/graph:min_cost_flow", "//ortools/graph:max_flow", diff --git a/ortools/linear_solver/samples/BUILD b/ortools/linear_solver/samples/BUILD index 21f28b3e30..5529222f30 100644 --- a/ortools/linear_solver/samples/BUILD +++ b/ortools/linear_solver/samples/BUILD @@ -1,19 +1,19 @@ load(":code_samples.bzl", "code_sample_cc") -code_sample_cc(sample = "assignment_mip") +code_sample_cc(name = "assignment_mip") -code_sample_cc(sample = "basic_example") +code_sample_cc(name = "basic_example") -code_sample_cc(sample = "bin_packing_mip") +code_sample_cc(name = "bin_packing_mip") -code_sample_cc(sample = "integer_programming_example") +code_sample_cc(name = "integer_programming_example") -code_sample_cc(sample = "linear_programming_example") +code_sample_cc(name = "linear_programming_example") -code_sample_cc(sample = "mip_var_array") +code_sample_cc(name = "mip_var_array") -code_sample_cc(sample = "multiple_knapsack_mip") +code_sample_cc(name = "multiple_knapsack_mip") -code_sample_cc(sample = "simple_lp_program") +code_sample_cc(name = "simple_lp_program") -code_sample_cc(sample = "simple_mip_program") +code_sample_cc(name = "simple_mip_program") diff --git a/ortools/linear_solver/samples/code_samples.bzl b/ortools/linear_solver/samples/code_samples.bzl index b69343fe33..06a05ccc79 100644 --- a/ortools/linear_solver/samples/code_samples.bzl +++ b/ortools/linear_solver/samples/code_samples.bzl @@ -1,7 +1,9 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/base", "//ortools/linear_solver", @@ -10,11 +12,11 @@ def code_sample_cc(sample): ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/base", "//ortools/linear_solver", "//ortools/linear_solver:linear_solver_cc_proto", diff --git a/ortools/sat/samples/BUILD b/ortools/sat/samples/BUILD index 24fc9ce78f..f9d45858d4 100644 --- a/ortools/sat/samples/BUILD +++ b/ortools/sat/samples/BUILD @@ -2,44 +2,44 @@ load(":code_samples.bzl", "code_sample_cc") COPTS=["-std=c++17"] -code_sample_cc(sample = "assignment_sat") +code_sample_cc(name = "assignment_sat") -code_sample_cc(sample = "binpacking_problem_sat") +code_sample_cc(name = "binpacking_problem_sat") -code_sample_cc(sample = "bool_or_sample_sat") +code_sample_cc(name = "bool_or_sample_sat") -code_sample_cc(sample = "channeling_sample_sat") +code_sample_cc(name = "channeling_sample_sat") -code_sample_cc(sample = "cp_is_fun_sat") +code_sample_cc(name = "cp_is_fun_sat") -code_sample_cc(sample = "earliness_tardiness_cost_sample_sat") +code_sample_cc(name = "earliness_tardiness_cost_sample_sat") -code_sample_cc(sample = "interval_sample_sat") +code_sample_cc(name = "interval_sample_sat") -code_sample_cc(sample = "literal_sample_sat") +code_sample_cc(name = "literal_sample_sat") -code_sample_cc(sample = "multiple_knapsack_sat") +code_sample_cc(name = "multiple_knapsack_sat") -code_sample_cc(sample = "no_overlap_sample_sat") +code_sample_cc(name = "no_overlap_sample_sat") -code_sample_cc(sample = "optional_interval_sample_sat") +code_sample_cc(name = "optional_interval_sample_sat") -code_sample_cc(sample = "rabbits_and_pheasants_sat") +code_sample_cc(name = "rabbits_and_pheasants_sat") -code_sample_cc(sample = "ranking_sample_sat") +code_sample_cc(name = "ranking_sample_sat") -code_sample_cc(sample = "reified_sample_sat") +code_sample_cc(name = "reified_sample_sat") -code_sample_cc(sample = "search_for_all_solutions_sample_sat") +code_sample_cc(name = "search_for_all_solutions_sample_sat") -code_sample_cc(sample = "simple_sat_program") +code_sample_cc(name = "simple_sat_program") -code_sample_cc(sample = "solution_hinting_sample_sat") +code_sample_cc(name = "solution_hinting_sample_sat") -code_sample_cc(sample = "solve_and_print_intermediate_solutions_sample_sat") +code_sample_cc(name = "solve_and_print_intermediate_solutions_sample_sat") -code_sample_cc(sample = "solve_with_time_limit_sample_sat") +code_sample_cc(name = "solve_with_time_limit_sample_sat") -code_sample_cc(sample = "step_function_sample_sat") +code_sample_cc(name = "step_function_sample_sat") -code_sample_cc(sample = "stop_after_n_solutions_sample_sat") +code_sample_cc(name = "stop_after_n_solutions_sample_sat") diff --git a/ortools/sat/samples/code_samples.bzl b/ortools/sat/samples/code_samples.bzl index c9b5f76446..d98c48e388 100644 --- a/ortools/sat/samples/code_samples.bzl +++ b/ortools/sat/samples/code_samples.bzl @@ -1,7 +1,9 @@ -def code_sample_cc(sample): +"""Helper macro to compile and test code samples.""" + +def code_sample_cc(name): native.cc_binary( - name = sample, - srcs = [sample + ".cc"], + name = name, + srcs = [name + ".cc"], deps = [ "//ortools/sat:cp_model", "//ortools/sat:cp_model_solver", @@ -9,11 +11,11 @@ def code_sample_cc(sample): ) native.cc_test( - name = sample+"_test", + name = name+"_test", size = "small", - srcs = [sample + ".cc"], + srcs = [name + ".cc"], deps = [ - ":"+sample, + ":"+name, "//ortools/sat:cp_model", "//ortools/sat:cp_model_solver", ],