Refactor a few utils / graph files, modernize hashing, expand constraint solver python bindings. (#5002)

* Refactor a few utils / graph files, modernize hashing, expand constraint solver python bindings.

* Also remove `aligned_memory` and `string_util`

Author: gchatelet

ortools/constraint_solver/BUILD.bazel

@@ -222,6 +222,7 @@ cc_library(
         "@abseil-cpp//absl/container:flat_hash_map",
         "@abseil-cpp//absl/container:flat_hash_set",
         "@abseil-cpp//absl/flags:flag",
+        "@abseil-cpp//absl/hash",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/log:check",
         "@abseil-cpp//absl/log:vlog_is_on",

ortools/constraint_solver/constraint_solver.h

@@ -3109,8 +3109,8 @@ class Solver {
   void set_fail_intercept(std::function<void()> fail_intercept) {
     fail_intercept_ = std::move(fail_intercept);
   }
-#endif  // !defined(SWIG)
   void clear_fail_intercept() { fail_intercept_ = nullptr; }
+#endif  // !defined(SWIG)
   /// Access to demon profiler.
   DemonProfiler* demon_profiler() const { return demon_profiler_; }
   // TODO(user): Get rid of the following methods once fast local search is

ortools/constraint_solver/demon_profiler.cc

@@ -13,25 +13,20 @@
 
 #include <algorithm>
 #include <cmath>
-#include <cstddef>
 #include <cstdint>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "absl/container/flat_hash_map.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "ortools/base/file.h"
-#include "ortools/base/hash.h"
 #include "ortools/base/helpers.h"
-#include "ortools/base/logging.h"
 #include "ortools/base/mathutil.h"
+#include "ortools/base/options.h"
 #include "ortools/base/stl_util.h"
-#include "ortools/base/types.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 #include "ortools/constraint_solver/demon_profiler.pb.h"

ortools/constraint_solver/diffn.cc

@@ -17,18 +17,16 @@
 #include <string>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 #include "absl/types/span.h"
-#include "ortools/base/hash.h"
 #include "ortools/base/int_type.h"
-#include "ortools/base/logging.h"
-#include "ortools/base/types.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 #include "ortools/util/string_array.h"
 
 namespace operations_research {
-// Diffn constraint, Non overlapping boxs.
+// Diffn constraint, Non overlapping boxes.
 namespace {
 DEFINE_INT_TYPE(Box, int);
 class Diffn : public Constraint {

ortools/constraint_solver/model_cache.cc

@@ -12,13 +12,13 @@
 // limitations under the License.
 
 #include <cstdint>
-#include <string>
 #include <vector>
 
-#include "ortools/base/commandlineflags.h"
-#include "ortools/base/logging.h"
+#include "absl/flags/declare.h"
+#include "absl/flags/flag.h"
+#include "absl/hash/hash.h"
+#include "absl/log/check.h"
 #include "ortools/base/stl_util.h"
-#include "ortools/base/types.h"
 #include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 
@@ -55,33 +55,6 @@ bool IsEqual(const std::vector<T*>& a1, const std::vector<T*>& a2) {
   return true;
 }
 
-template <class A1, class A2>
-uint64_t Hash2(const A1& a1, const A2& a2) {
-  uint64_t a = Hash1(a1);
-  uint64_t b = uint64_t{0xe08c1d668b756f82};  // more of the golden ratio
-  uint64_t c = Hash1(a2);
-  mix(a, b, c);
-  return c;
-}
-
-template <class A1, class A2, class A3>
-uint64_t Hash3(const A1& a1, const A2& a2, const A3& a3) {
-  uint64_t a = Hash1(a1);
-  uint64_t b = Hash1(a2);
-  uint64_t c = Hash1(a3);
-  mix(a, b, c);
-  return c;
-}
-
-template <class A1, class A2, class A3, class A4>
-uint64_t Hash4(const A1& a1, const A2& a2, const A3& a3, const A4& a4) {
-  uint64_t a = Hash1(a1);
-  uint64_t b = Hash1(a2);
-  uint64_t c = Hash2(a3, a4);
-  mix(a, b, c);
-  return c;
-}
-
 template <class C>
 void Double(C*** array_ptr, int* size_ptr) {
   DCHECK(array_ptr != nullptr);
@@ -229,7 +202,7 @@ class Cache2 {
   }
 
   C* Find(const A1& a1, const A2& a2) const {
-    uint64_t code = Hash2(a1, a2) % size_;
+    uint64_t code = absl::HashOf(a1, a2) % size_;
     Cell* tmp = array_[code];
     while (tmp) {
       C* const result = tmp->ReturnsIfEqual(a1, a2);
@@ -242,7 +215,7 @@ class Cache2 {
   }
 
   void UnsafeInsert(const A1& a1, const A2& a2, C* const c) {
-    const int position = Hash2(a1, a2) % size_;
+    const int position = absl::HashOf(a1, a2) % size_;
     Cell* const cell = new Cell(a1, a2, c, array_[position]);
     array_[position] = cell;
     if (++num_items_ > 2 * size_) {
@@ -263,7 +236,7 @@ class Cache2 {
       return nullptr;
     }
 
-    uint64_t Hash() const { return Hash2(a1_, a2_); }
+    uint64_t Hash() const { return absl::HashOf(a1_, a2_); }
 
     void set_next(Cell* const next) { next_ = next; }
 
@@ -318,7 +291,7 @@ class Cache3 {
   }
 
   C* Find(const A1& a1, const A2& a2, const A3& a3) const {
-    uint64_t code = Hash3(a1, a2, a3) % size_;
+    uint64_t code = absl::HashOf(a1, a2, a3) % size_;
     Cell* tmp = array_[code];
     while (tmp) {
       C* const result = tmp->ReturnsIfEqual(a1, a2, a3);
@@ -331,7 +304,7 @@ class Cache3 {
   }
 
   void UnsafeInsert(const A1& a1, const A2& a2, const A3& a3, C* const c) {
-    const int position = Hash3(a1, a2, a3) % size_;
+    const int position = absl::HashOf(a1, a2, a3) % size_;
     Cell* const cell = new Cell(a1, a2, a3, c, array_[position]);
     array_[position] = cell;
     if (++num_items_ > 2 * size_) {
@@ -353,7 +326,7 @@ class Cache3 {
       return nullptr;
     }
 
-    uint64_t Hash() const { return Hash3(a1_, a2_, a3_); }
+    uint64_t Hash() const { return absl::HashOf(a1_, a2_, a3_); }
 
     void set_next(Cell* const next) { next_ = next; }