Skip to content

Commit c96c824

Browse files
MizuxMizux
committed
backport examples from main
1 parent bdfbbc6 commit c96c824

28 files changed

+137
-87
lines changed

‎examples/cpp/binpacking_2d_sat.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@
2424
#include <utility>
2525
#include <vector>
2626

27+
#include "absl/base/log_severity.h"
2728
#include "absl/container/btree_map.h"
2829
#include "absl/container/btree_set.h"
2930
#include "absl/flags/flag.h"
3031
#include "absl/log/check.h"
32+
#include "absl/log/globals.h"
3133
#include "absl/strings/str_cat.h"
3234
#include "absl/types/span.h"
3335
#include "google/protobuf/text_format.h"
@@ -555,7 +557,7 @@ void LoadAndSolve(const std::string& file_name, int instance) {
555557
} // namespace operations_research
556558

557559
int main(int argc, char** argv) {
558-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
560+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
559561
InitGoogle(argv[0], &argc, &argv, true);
560562
if (absl::GetFlag(FLAGS_input).empty()) {
561563
LOG(FATAL) << "Please supply a data file with --input=";

‎examples/cpp/constraint_programming_cp.cc

+9-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,12 @@
1313

1414
// Constraint programming example that shows how to use the API.
1515

16+
#include <cstdint>
17+
#include <cstdlib>
1618
#include <vector>
1719

20+
#include "absl/base/log_severity.h"
21+
#include "absl/log/globals.h"
1822
#include "ortools/base/init_google.h"
1923
#include "ortools/base/logging.h"
2024
#include "ortools/constraint_solver/constraint_solver.h"
@@ -23,12 +27,12 @@ namespace operations_research {
2327
void RunConstraintProgrammingExample() {
2428
// Instantiate the solver.
2529
Solver solver("ConstraintProgrammingExample");
26-
const int64_t numVals = 3;
30+
const int64_t kNumVals = 3;
2731

2832
// Define decision variables.
29-
IntVar* const x = solver.MakeIntVar(0, numVals - 1, "x");
30-
IntVar* const y = solver.MakeIntVar(0, numVals - 1, "y");
31-
IntVar* const z = solver.MakeIntVar(0, numVals - 1, "z");
33+
IntVar* const x = solver.MakeIntVar(0, kNumVals - 1, "x");
34+
IntVar* const y = solver.MakeIntVar(0, kNumVals - 1, "y");
35+
IntVar* const z = solver.MakeIntVar(0, kNumVals - 1, "z");
3236

3337
// Define constraints.
3438
std::vector<IntVar*> xyvars = {x, y};
@@ -57,7 +61,7 @@ void RunConstraintProgrammingExample() {
5761
} // namespace operations_research
5862

5963
int main(int argc, char** argv) {
60-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
64+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
6165
InitGoogle(argv[0], &argc, &argv, true);
6266
operations_research::RunConstraintProgrammingExample();
6367
return EXIT_SUCCESS;

‎examples/cpp/costas_array_sat.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@
2828
#include <utility>
2929
#include <vector>
3030

31+
#include "absl/base/log_severity.h"
3132
#include "absl/flags/flag.h"
33+
#include "absl/log/globals.h"
3234
#include "absl/strings/str_cat.h"
3335
#include "absl/strings/str_format.h"
3436
#include "absl/types/span.h"
@@ -297,7 +299,7 @@ void CostasBoolSoft(const int dim) {
297299
} // namespace operations_research
298300

299301
int main(int argc, char** argv) {
300-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
302+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
301303
InitGoogle(argv[0], &argc, &argv, true);
302304

303305
int min = 1;

‎examples/cpp/fap_parser.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,20 @@
2020
#include "absl/strings/match.h"
2121
#include "absl/strings/numbers.h"
2222
#include "absl/strings/str_split.h"
23+
#include "absl/strings/string_view.h"
2324
#include "ortools/base/helpers.h"
2425
#include "ortools/base/map_util.h"
2526

2627
namespace operations_research {
2728
namespace {
28-
int strtoint32(const std::string& word) {
29+
int strtoint32(absl::string_view word) {
2930
int result;
3031
CHECK(absl::SimpleAtoi(word, &result));
3132
return result;
3233
}
3334
} // namespace
3435

35-
void ParseFileByLines(const std::string& filename,
36+
void ParseFileByLines(absl::string_view filename,
3637
std::vector<std::string>* lines) {
3738
CHECK(lines != nullptr);
3839
std::string result;

‎examples/cpp/fap_parser.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,13 @@
2424

2525
#include "absl/container/btree_map.h"
2626
#include "absl/container/flat_hash_map.h"
27+
#include "absl/strings/string_view.h"
2728

2829
namespace operations_research {
2930

3031
// Takes a filename and a buffer and fills the lines buffer
3132
// with the lines of the file corresponding to the filename.
32-
void ParseFileByLines(const std::string& filename,
33+
void ParseFileByLines(absl::string_view filename,
3334
std::vector<std::string>* lines);
3435

3536
// The FapVariable struct represents a radio link of the

‎examples/cpp/golomb_sat.cc

+7-2
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,21 @@
2626

2727
#include <cstdint>
2828
#include <cstdio>
29+
#include <cstdlib>
30+
#include <string>
2931
#include <vector>
3032

33+
#include "absl/base/log_severity.h"
3134
#include "absl/flags/flag.h"
35+
#include "absl/log/check.h"
36+
#include "absl/log/globals.h"
3237
#include "absl/strings/str_format.h"
3338
#include "google/protobuf/text_format.h"
3439
#include "ortools/base/init_google.h"
3540
#include "ortools/base/logging.h"
36-
#include "ortools/base/types.h"
3741
#include "ortools/sat/cp_model.h"
3842
#include "ortools/sat/model.h"
43+
#include "ortools/util/sorted_interval_list.h"
3944

4045
ABSL_FLAG(bool, print, false, "If true, print the minimal solution.");
4146
ABSL_FLAG(
@@ -120,7 +125,7 @@ void GolombRuler(int size) {
120125
} // namespace operations_research
121126

122127
int main(int argc, char** argv) {
123-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
128+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
124129
InitGoogle(argv[0], &argc, &argv, true);
125130

126131
if (absl::GetFlag(FLAGS_size) != 0) {

‎examples/cpp/integer_programming.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,12 @@
1313

1414
// Integer programming example that shows how to use the API.
1515

16+
#include <cstdlib>
1617
#include <string>
1718
#include <vector>
1819

19-
#include "absl/flags/flag.h"
20+
#include "absl/base/log_severity.h"
21+
#include "absl/log/globals.h"
2022
#include "absl/strings/match.h"
2123
#include "absl/strings/string_view.h"
2224
#include "ortools/base/init_google.h"
@@ -94,7 +96,7 @@ void RunAllExamples() {
9496
} // namespace operations_research
9597

9698
int main(int argc, char** argv) {
97-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
99+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
98100
InitGoogle(argv[0], &argc, &argv, true);
99101
operations_research::RunAllExamples();
100102
return EXIT_SUCCESS;

‎examples/cpp/jobshop_sat.cc

+3-1
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
#include <string>
1919
#include <vector>
2020

21+
#include "absl/base/log_severity.h"
2122
#include "absl/container/flat_hash_map.h"
2223
#include "absl/container/flat_hash_set.h"
2324
#include "absl/flags/flag.h"
2425
#include "absl/log/check.h"
26+
#include "absl/log/globals.h"
2527
#include "absl/strings/str_join.h"
2628
#include "absl/types/span.h"
2729
#include "google/protobuf/text_format.h"
@@ -848,7 +850,7 @@ void Solve(const JsspInputProblem& problem) {
848850
} // namespace operations_research
849851

850852
int main(int argc, char** argv) {
851-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
853+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
852854
InitGoogle(argv[0], &argc, &argv, true);
853855

854856
if (absl::GetFlag(FLAGS_input).empty()) {

‎examples/cpp/knapsack_2d_sat.cc

+9-7
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,27 @@
1212
// limitations under the License.
1313

1414
// This file solves a 2D Bin Packing problem as a 2D Knapsack problem.
15-
// It loads the size of the mainrectangle, all available items (rectangles too),
16-
// and tries to fit as many rectangles as possible in the main rectangle.
15+
// It loads the size of the main rectangle, all available items (rectangles
16+
// too), and tries to fit as many rectangles as possible in the main rectangle.
1717

18-
#include <algorithm>
1918
#include <cstdint>
20-
#include <limits>
19+
#include <cstdlib>
2120
#include <string>
2221
#include <vector>
2322

23+
#include "absl/base/log_severity.h"
2424
#include "absl/flags/flag.h"
25+
#include "absl/log/check.h"
26+
#include "absl/log/globals.h"
2527
#include "absl/types/span.h"
2628
#include "google/protobuf/text_format.h"
27-
#include "ortools/base/commandlineflags.h"
2829
#include "ortools/base/init_google.h"
2930
#include "ortools/base/logging.h"
3031
#include "ortools/packing/binpacking_2d_parser.h"
3132
#include "ortools/packing/multiple_dimensions_bin_packing.pb.h"
3233
#include "ortools/sat/cp_model.h"
3334
#include "ortools/sat/cp_model_solver.h"
35+
#include "ortools/util/sorted_interval_list.h"
3436

3537
ABSL_FLAG(std::string, input, "", "Input file.");
3638
ABSL_FLAG(int, instance, -1, "Instance number if the file.");
@@ -106,7 +108,7 @@ void CheckAndPrint2DSolution(
106108
}
107109
}
108110

109-
// Load a 2d binpacking problem and solve it as a 2d knapsack problem.
111+
// Load a 2d bin-packing problem and solve it as a 2d knapsack problem.
110112
// That is fit the max number of object in one box.
111113
void LoadAndSolve(const std::string& file_name, int instance) {
112114
packing::BinPacking2dParser parser;
@@ -226,7 +228,7 @@ void LoadAndSolve(const std::string& file_name, int instance) {
226228
} // namespace operations_research
227229

228230
int main(int argc, char** argv) {
229-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
231+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
230232
InitGoogle(argv[0], &argc, &argv, true);
231233
if (absl::GetFlag(FLAGS_input).empty()) {
232234
LOG(FATAL) << "Please supply a data file with --input=";

‎examples/cpp/linear_programming.cc

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
#include <string>
1818
#include <vector>
1919

20-
#include "absl/flags/flag.h"
20+
#include "absl/base/log_severity.h"
21+
#include "absl/log/globals.h"
2122
#include "absl/strings/match.h"
2223
#include "absl/strings/string_view.h"
2324
#include "ortools/base/commandlineflags.h"
@@ -122,7 +123,7 @@ void RunAllExamples() {
122123
} // namespace operations_research
123124

124125
int main(int argc, char** argv) {
125-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
126+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
126127
InitGoogle(argv[0], &argc, &argv, true);
127128
operations_research::RunAllExamples();
128129
return EXIT_SUCCESS;

‎examples/cpp/linear_solver_protocol_buffers.cc

+8-17
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
#include <limits>
1415
#include <string>
1516

1617
#include "ortools/base/init_google.h"
1718
#include "ortools/base/logging.h"
18-
#include "ortools/linear_solver/linear_solver.h"
1919
#include "ortools/linear_solver/linear_solver.pb.h"
20+
#include "ortools/linear_solver/solve_mp_model.h"
2021

2122
namespace operations_research {
22-
void BuildLinearProgrammingMaxExample(MPSolver::OptimizationProblemType type) {
23+
void BuildLinearProgrammingMaxExample(MPModelRequest::SolverType type) {
2324
const double kObjCoef[] = {10.0, 6.0, 4.0};
2425
const std::string kVarName[] = {"x1", "x2", "x3"};
2526
const int numVars = 3;
@@ -32,7 +33,7 @@ void BuildLinearProgrammingMaxExample(MPSolver::OptimizationProblemType type) {
3233
kConstraintCoef3};
3334
const double kConstraintUb[] = {100.0, 600.0, 300.0};
3435

35-
const double infinity = MPSolver::infinity();
36+
const double infinity = std::numeric_limits<double>::infinity();
3637
MPModelProto model_proto;
3738
model_proto.set_name("Max_Example");
3839

@@ -62,19 +63,9 @@ void BuildLinearProgrammingMaxExample(MPSolver::OptimizationProblemType type) {
6263

6364
MPModelRequest model_request;
6465
*model_request.mutable_model() = model_proto;
65-
#if defined(USE_GLOP)
66-
if (type == MPSolver::GLOP_LINEAR_PROGRAMMING) {
67-
model_request.set_solver_type(MPModelRequest::GLOP_LINEAR_PROGRAMMING);
68-
}
69-
#endif // USE_GLOP
70-
#if defined(USE_CLP)
71-
if (type == MPSolver::CLP_LINEAR_PROGRAMMING) {
72-
model_request.set_solver_type(MPModelRequest::CLP_LINEAR_PROGRAMMING);
73-
}
74-
#endif // USE_CLP
66+
model_request.set_solver_type(type);
7567

76-
MPSolutionResponse solution_response;
77-
MPSolver::SolveWithProto(model_request, &solution_response);
68+
const MPSolutionResponse solution_response = SolveMPModel(model_request);
7869

7970
// The problem has an optimal solution.
8071
CHECK_EQ(MPSOLVER_OPTIMAL, solution_response.status());
@@ -89,11 +80,11 @@ void BuildLinearProgrammingMaxExample(MPSolver::OptimizationProblemType type) {
8980
void RunAllExamples() {
9081
#if defined(USE_GLOP)
9182
LOG(INFO) << "----- Running Max Example with GLOP -----";
92-
BuildLinearProgrammingMaxExample(MPSolver::GLOP_LINEAR_PROGRAMMING);
83+
BuildLinearProgrammingMaxExample(MPModelRequest::GLOP_LINEAR_PROGRAMMING);
9384
#endif // USE_GLOP
9485
#if defined(USE_CLP)
9586
LOG(INFO) << "----- Running Max Example with Coin LP -----";
96-
BuildLinearProgrammingMaxExample(MPSolver::CLP_LINEAR_PROGRAMMING);
87+
BuildLinearProgrammingMaxExample(MPModelRequest::CLP_LINEAR_PROGRAMMING);
9788
#endif // USE_CLP
9889
}
9990
} // namespace operations_research

‎examples/cpp/magic_sequence_sat.cc

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,13 @@
2222
#include <string>
2323
#include <vector>
2424

25+
#include "absl/base/log_severity.h"
2526
#include "absl/flags/flag.h"
27+
#include "absl/log/check.h"
28+
#include "absl/log/globals.h"
2629
#include "absl/strings/str_format.h"
2730
#include "ortools/base/init_google.h"
2831
#include "ortools/base/logging.h"
29-
#include "ortools/base/types.h"
3032
#include "ortools/sat/cp_model.h"
3133

3234
ABSL_FLAG(int, size, 50, "Size of the problem.");
@@ -92,7 +94,7 @@ void MagicSequence(int size) {
9294
} // namespace operations_research
9395

9496
int main(int argc, char** argv) {
95-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
97+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
9698
InitGoogle(argv[0], &argc, &argv, true);
9799

98100
operations_research::sat::MagicSequence(absl::GetFlag(FLAGS_size));

‎examples/cpp/magic_square_sat.cc

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14+
#include <cstdlib>
1415
#include <string>
1516
#include <vector>
1617

18+
#include "absl/base/log_severity.h"
1719
#include "absl/flags/flag.h"
18-
#include "absl/strings/str_cat.h"
20+
#include "absl/log/globals.h"
1921
#include "absl/strings/str_format.h"
2022
#include "ortools/base/init_google.h"
2123
#include "ortools/base/logging.h"
22-
#include "ortools/base/types.h"
2324
#include "ortools/sat/cp_model.h"
2425
#include "ortools/sat/model.h"
26+
#include "ortools/util/sorted_interval_list.h"
2527

2628
ABSL_FLAG(int, size, 7, "Size of the magic square");
2729
ABSL_FLAG(std::string, params, "", "Sat parameters");
@@ -101,7 +103,7 @@ void MagicSquare(int size) {
101103
} // namespace operations_research
102104

103105
int main(int argc, char** argv) {
104-
absl::SetFlag(&FLAGS_stderrthreshold, 0);
106+
absl::SetStderrThreshold(absl::LogSeverityAtLeast::kInfo);
105107
InitGoogle(argv[0], &argc, &argv, true);
106108

107109
operations_research::sat::MagicSquare(absl::GetFlag(FLAGS_size));

0 commit comments

Comments
 (0)