From 95dd14be0d41ec8a42737fbbabb215fc57dc8ce4 Mon Sep 17 00:00:00 2001
From: Laurent Perron <lperron@google.com>
Date: Fri, 21 Jan 2022 11:59:32 +0100
Subject: [PATCH] misc sync code

---
 ortools/gscip/gscip.cc        | 7 +++++++
 ortools/gscip/gscip.h         | 2 ++
 ortools/gurobi/environment.cc | 1 -
 ortools/lp_data/mps_reader.cc | 1 +
 ortools/lp_data/mps_reader.h  | 1 -
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ortools/gscip/gscip.cc b/ortools/gscip/gscip.cc
index afb6f04d59..742898ce05 100644
--- a/ortools/gscip/gscip.cc
+++ b/ortools/gscip/gscip.cc
@@ -738,6 +738,13 @@ absl::Status GScip::SetLinearConstraintCoef(SCIP_CONS* constraint,
   return absl::OkStatus();
 }
 
+absl::Status GScip::AddLinearConstraintCoef(SCIP_CONS* const constraint,
+                                            SCIP_VAR* const var,
+                                            const double value) {
+  RETURN_IF_SCIP_ERROR(SCIPaddCoefLinear(scip_, constraint, var, value));
+  return absl::OkStatus();
+}
+
 absl::StatusOr<GScipHintResult> GScip::SuggestHint(
     const GScipSolution& partial_solution) {
   SCIP_SOL* solution;
diff --git a/ortools/gscip/gscip.h b/ortools/gscip/gscip.h
index af5867f641..7ed85e43e6 100644
--- a/ortools/gscip/gscip.h
+++ b/ortools/gscip/gscip.h
@@ -233,6 +233,8 @@ class GScip {
   absl::Status SetLinearConstraintUb(SCIP_CONS* constraint, double ub);
   absl::Status SetLinearConstraintCoef(SCIP_CONS* constraint, SCIP_VAR* var,
                                        double value);
+  absl::Status AddLinearConstraintCoef(SCIP_CONS* constraint, SCIP_VAR* var,
+                                       double value);
 
   // Works on all constraint types. Unlike DeleteVariable, no special action is
   // required before deleting a constraint.
diff --git a/ortools/gurobi/environment.cc b/ortools/gurobi/environment.cc
index b2a5223cbe..b2ebfb2dbf 100644
--- a/ortools/gurobi/environment.cc
+++ b/ortools/gurobi/environment.cc
@@ -43,7 +43,6 @@ bool GurobiIsCorrectlyInstalled() {
 // See the comment at the top of the script.
 
 // This is the 'define' section.
-
 std::function<int(GRBenv**, const char*, const char*, const char*, int,
                   const char*)>
     GRBisqp = nullptr;
diff --git a/ortools/lp_data/mps_reader.cc b/ortools/lp_data/mps_reader.cc
index 889b033d94..86dc0ae055 100644
--- a/ortools/lp_data/mps_reader.cc
+++ b/ortools/lp_data/mps_reader.cc
@@ -20,6 +20,7 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_split.h"
+#include "ortools/base/protobuf_util.h"
 #include "ortools/base/status_builder.h"
 #include "ortools/lp_data/lp_types.h"
 
diff --git a/ortools/lp_data/mps_reader.h b/ortools/lp_data/mps_reader.h
index 43b6914837..c2ff7654e5 100644
--- a/ortools/lp_data/mps_reader.h
+++ b/ortools/lp_data/mps_reader.h
@@ -31,7 +31,6 @@
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
-#include "absl/container/node_hash_set.h"
 #include "absl/flags/declare.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"