From fef3287129a896946ec2f932096cc9509a25ff44 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 16 Oct 2023 15:48:29 +0200 Subject: [PATCH] examples: fix parse_dimacs_assignment.h --- examples/cpp/parse_dimacs_assignment.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/examples/cpp/parse_dimacs_assignment.h b/examples/cpp/parse_dimacs_assignment.h index 5e4b051df8..6147e6374f 100644 --- a/examples/cpp/parse_dimacs_assignment.h +++ b/examples/cpp/parse_dimacs_assignment.h @@ -21,15 +21,15 @@ #include #include -#include #include #include #include #include +#include "absl/flags/declare.h" +#include "absl/flags/flag.h" +#include "absl/log/check.h" #include "absl/strings/string_view.h" -#include "ortools/base/commandlineflags.h" -#include "ortools/base/logging.h" #include "ortools/graph/ebert_graph.h" #include "ortools/graph/linear_assignment.h" #include "ortools/util/filelineiter.h" @@ -161,18 +161,15 @@ void DimacsAssignmentParser::ParseArcLine(const std::string& line) { } NodeIndex tail; NodeIndex head; - // We don't use int64_t/CostValue here because of go/int64_t-cleanup. - int64_t cost; + CostValue cost; if (sscanf(line.c_str(), "%*c%d%d%" SCNd64, &tail, &head, &cost) != 3) { state_.bad = true; state_.reason = "Syntax error in arc descriptor."; state_.bad_line.reset(new std::string(line)); } - const CostValue cost_value{cost}; ArcIndex arc = graph_builder_->AddArc(tail - 1, head - 1); - assignment_->SetArcCost(arc, absl::GetFlag(FLAGS_assignment_maximize_cost) - ? -cost_value - : cost_value); + assignment_->SetArcCost( + arc, absl::GetFlag(FLAGS_assignment_maximize_cost) ? -cost : cost); } // Parameters out of style-guide order because this function is used