[ModelBuilder] big update on the code; remove hash table, use c++ can…

…onicalization of linear expressions; remove code duplication
google · Jul 27, 2023 · 5b8cdcd · 5b8cdcd
1 parent 6d8495f
commit 5b8cdcd
Show file tree

Hide file tree

Showing 4 changed files with 359 additions and 322 deletions.
diff --git a/ortools/linear_solver/proto_solver/scip_proto_solver.cc b/ortools/linear_solver/proto_solver/scip_proto_solver.cc
@@ -73,13 +73,7 @@ absl::StatusOr<double> ScipInfClamp(SCIP* scip, const double d) {
     return absl::InvalidArgumentError("Cannot clamp a NaN.");
   }
   const double kScipInf = SCIPinfinity(scip);
-  if (d > -kScipInf && d < kScipInf) {
-    return d;
-  }
   const double clamped = std::clamp(d, -kScipInf, kScipInf);
-  LOG_EVERY_N_SEC(WARNING, 5) << "A bound was clamped to SCIP's 'infinite' "
-                                 "value for safety; this may affect results. "
-                              << "Was: " << d << ", is now: " << clamped;
   return clamped;
 }