[CP-SAT] more work on no_overlap_2d; revisit all includes

google · Dec 4, 2024 · d8c3e49 · d8c3e49
1 parent ea680ce
commit d8c3e49
Show file tree

Hide file tree

Showing 177 changed files with 964 additions and 573 deletions.
diff --git a/ortools/java/com/google/ortools/sat/AutomatonConstraint.java b/ortools/java/com/google/ortools/sat/AutomatonConstraint.java
@@ -28,6 +28,7 @@ public AutomatonConstraint(CpModelProto.Builder builder) {
   /**
    * Adds a transitions to the automaton.
    *
+   * @param tail the tail of the transition
    * @param head the head of the transition
    * @param label the label of the transition
    * @return this constraint

diff --git a/ortools/sat/2d_orthogonal_packing.cc b/ortools/sat/2d_orthogonal_packing.cc
@@ -28,7 +28,7 @@
 #include "absl/types/span.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/2d_packing_brute_force.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/sat/util.h"
 #include "ortools/util/bitset.h"
 

diff --git a/ortools/sat/2d_orthogonal_packing.h b/ortools/sat/2d_orthogonal_packing.h
@@ -14,7 +14,6 @@
 #ifndef OR_TOOLS_SAT_2D_ORTHOGONAL_PACKING_H_
 #define OR_TOOLS_SAT_2D_ORTHOGONAL_PACKING_H_
 
-#include <algorithm>
 #include <cstdint>
 #include <limits>
 #include <utility>
@@ -23,8 +22,9 @@
 #include "absl/log/check.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/types/span.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/sat/synchronization.h"
+#include "ortools/util/bitset.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_orthogonal_packing_testing.cc b/ortools/sat/2d_orthogonal_packing_testing.cc
@@ -25,7 +25,7 @@
 #include "absl/random/distributions.h"
 #include "absl/types/span.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_orthogonal_packing_testing.h b/ortools/sat/2d_orthogonal_packing_testing.h
@@ -20,7 +20,7 @@
 #include "absl/random/bit_gen_ref.h"
 #include "absl/types/span.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_packing_brute_force.cc b/ortools/sat/2d_packing_brute_force.cc
@@ -26,7 +26,7 @@
 #include "absl/types/span.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/util/bitset.h"
 
 namespace operations_research {

diff --git a/ortools/sat/2d_packing_brute_force.h b/ortools/sat/2d_packing_brute_force.h
@@ -19,7 +19,7 @@
 
 #include "absl/types/span.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_packing_brute_force_test.cc b/ortools/sat/2d_packing_brute_force_test.cc
@@ -31,7 +31,7 @@
 #include "ortools/sat/cp_model.h"
 #include "ortools/sat/cp_model_solver.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_rectangle_presolve.cc b/ortools/sat/2d_rectangle_presolve.cc
@@ -34,7 +34,7 @@
 #include "ortools/graph/max_flow.h"
 #include "ortools/graph/strongly_connected_components.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_rectangle_presolve.h b/ortools/sat/2d_rectangle_presolve.h
@@ -23,7 +23,7 @@
 #include "absl/container/inlined_vector.h"
 #include "absl/types/span.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_rectangle_presolve_test.cc b/ortools/sat/2d_rectangle_presolve_test.cc
@@ -36,7 +36,7 @@
 #include "ortools/base/logging.h"
 #include "ortools/sat/2d_orthogonal_packing_testing.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 
 namespace operations_research {
 namespace sat {

diff --git a/ortools/sat/2d_try_edge_propagator.cc b/ortools/sat/2d_try_edge_propagator.cc
@@ -28,6 +28,7 @@
 #include "ortools/base/stl_util.h"
 #include "ortools/sat/diffn_util.h"
 #include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/sat/intervals.h"
 #include "ortools/sat/model.h"
 #include "ortools/sat/synchronization.h"

diff --git a/ortools/sat/2d_try_edge_propagator.h b/ortools/sat/2d_try_edge_propagator.h
@@ -21,6 +21,7 @@
 
 #include "ortools/sat/diffn_util.h"
 #include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/sat/intervals.h"
 #include "ortools/sat/model.h"
 #include "ortools/sat/synchronization.h"

diff --git a/ortools/sat/2d_try_edge_propagator_test.cc b/ortools/sat/2d_try_edge_propagator_test.cc
@@ -28,7 +28,7 @@
 #include "ortools/base/gmock.h"
 #include "ortools/sat/2d_orthogonal_packing_testing.h"
 #include "ortools/sat/diffn_util.h"
-#include "ortools/sat/integer.h"
+#include "ortools/sat/integer_base.h"
 #include "ortools/sat/intervals.h"
 #include "ortools/sat/model.h"