mostly cleaning: remove integral_types.h and basictypes.h

google · Aug 24, 2023 · fa6883d · fa6883d
1 parent d08a7ff
commit fa6883d
Show file tree

Hide file tree

Showing 137 changed files with 530 additions and 636 deletions.
diff --git a/cmake/python.cmake b/cmake/python.cmake
@@ -272,8 +272,8 @@ file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/util/__init__.py CONTENT "")
 file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/util/python/__init__.py CONTENT "")
 
 file(COPY
-  ortools/linear_solver/linear_solver_natural_api.py
-  DESTINATION ${PYTHON_PROJECT_DIR}/linear_solver)
+  ortools/linear_solver/python/linear_solver_natural_api.py
+  DESTINATION ${PYTHON_PROJECT_DIR}/linear_solver/python)
 file(COPY
   ortools/linear_solver/python/model_builder.py
   ortools/linear_solver/python/model_builder_numbers.py

diff --git a/examples/cpp/costas_array_sat.cc b/examples/cpp/costas_array_sat.cc
@@ -32,7 +32,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/cp_model.h"
 #include "ortools/sat/model.h"

diff --git a/examples/cpp/cvrp_disjoint_tw.cc b/examples/cpp/cvrp_disjoint_tw.cc
@@ -30,7 +30,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_index_manager.h"

diff --git a/examples/cpp/cvrptw.cc b/examples/cpp/cvrptw.cc
@@ -29,7 +29,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_index_manager.h"

diff --git a/examples/cpp/cvrptw_with_breaks.cc b/examples/cpp/cvrptw_with_breaks.cc
@@ -34,7 +34,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_enums.pb.h"

diff --git a/examples/cpp/cvrptw_with_refueling.cc b/examples/cpp/cvrptw_with_refueling.cc
@@ -27,7 +27,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_index_manager.h"

diff --git a/examples/cpp/cvrptw_with_resources.cc b/examples/cpp/cvrptw_with_resources.cc
@@ -29,7 +29,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_index_manager.h"

diff --git a/examples/cpp/cvrptw_with_stop_times_and_resources.cc b/examples/cpp/cvrptw_with_stop_times_and_resources.cc
@@ -28,7 +28,7 @@
 #include "google/protobuf/text_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/constraint_solver/routing.h"
 #include "ortools/constraint_solver/routing_index_manager.h"

diff --git a/examples/cpp/dobble_ls.cc b/examples/cpp/dobble_ls.cc
@@ -40,7 +40,7 @@
 #include "absl/strings/str_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/map_util.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 #include "ortools/util/bitset.h"

diff --git a/examples/cpp/golomb_sat.cc b/examples/cpp/golomb_sat.cc
@@ -32,7 +32,7 @@
 #include "absl/strings/str_format.h"
 #include "google/protobuf/text_format.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/cp_model.h"
 #include "ortools/sat/model.h"

diff --git a/examples/cpp/magic_sequence_sat.cc b/examples/cpp/magic_sequence_sat.cc
@@ -25,7 +25,7 @@
 #include "absl/flags/flag.h"
 #include "absl/strings/str_format.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/cp_model.h"
 

diff --git a/examples/cpp/magic_square_sat.cc b/examples/cpp/magic_square_sat.cc
@@ -18,7 +18,7 @@
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_format.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/sat/cp_model.h"
 #include "ortools/sat/model.h"

diff --git a/examples/cpp/nqueens.cc b/examples/cpp/nqueens.cc
@@ -26,7 +26,7 @@
 #include "absl/strings/str_format.h"
 #include "ortools/base/commandlineflags.h"
 #include "ortools/base/init_google.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/map_util.h"
 #include "ortools/constraint_solver/constraint_solveri.h"

diff --git a/examples/tests/remote/tsp.cc b/examples/tests/remote/tsp.cc
@@ -26,7 +26,7 @@
 
 #include "base/callback.h"
 #include "base/commandlineflags.h"
-#include "base/integral_types.h"
+#include "base/types.h"
 #include "base/join.h"
 #include "base/random.h"
 #include "base/unique_ptr.h"

diff --git a/ortools/algorithms/set_cover_model.cc b/ortools/algorithms/set_cover_model.cc
@@ -25,13 +25,16 @@ void SetCoverModel::AddEmptySubset(Cost cost) {
   row_view_is_valid_ = false;
 }
 
-void SetCoverModel::AddElementToLastSubset(int element) {
-  ElementIndex new_element(element);
-  columns_.back().push_back(new_element);
-  num_elements_ = std::max(num_elements_, new_element + 1);
+void SetCoverModel::AddElementToLastSubset(ElementIndex element) {
+  columns_.back().push_back(element);
+  num_elements_ = std::max(num_elements_, element + 1);
   row_view_is_valid_ = false;
 }
 
+void SetCoverModel::AddElementToLastSubset(int element) {
+  AddElementToLastSubset(ElementIndex(element));
+}
+
 void SetCoverModel::SetSubsetCost(int subset, Cost cost) {
   const SubsetIndex subset_index(subset);
   const SubsetIndex size = std::max(columns_.size(), subset_index + 1);

diff --git a/ortools/algorithms/set_cover_model.h b/ortools/algorithms/set_cover_model.h
@@ -101,6 +101,7 @@ class SetCoverModel {
   // Adds an element to the last subset created. In matrix terms, this adds a
   // 1 on row 'element' of the current last column of the matrix.
   void AddElementToLastSubset(int element);
+  void AddElementToLastSubset(ElementIndex element);
 
   // Sets 'cost' to an already existing 'subset'.
   void SetSubsetCost(int subset, Cost cost);

diff --git a/ortools/base/BUILD.bazel b/ortools/base/BUILD.bazel
@@ -44,10 +44,8 @@ cc_library(
     hdrs = [
         "commandlineflags.h",
         "init_google.h",
-        "integral_types.h",
         "logging.h",
         "stl_logging.h",
-        "types.h",
         "version.h",
     ],
     copts = [
@@ -63,10 +61,9 @@ cc_library(
     }),
     deps = [
         ":commandlineflags",
-        ":integral_types",
+        ":types",
         ":logging",
         ":macros",
-        ":types",
         "@com_google_absl//absl/base",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
@@ -95,24 +92,20 @@ cc_library(
     ],
     deps = [
         ":base",
-        ":basictypes",
+        ":types",
     ],
 )
 
 cc_library(
-    name = "basictypes",
-    hdrs = ["basictypes.h"],
-    deps = [
-        ":integral_types",
-        ":logging",
-    ],
+    name = "types",
+    hdrs = ["types.h"],
 )
 
 cc_library(
     name = "bitmap",
     srcs = ["bitmap.cc"],
     hdrs = ["bitmap.h"],
-    deps = [":integral_types"],
+    deps = [":types"],
 )
 
 cc_library(
@@ -242,7 +235,7 @@ cc_library(
     hdrs = ["gzipfile.h"],
     deps = [
         ":base",
-        ":basictypes",
+        ":types",
         ":file",
         ":path",
         "@com_google_absl//absl/strings",
@@ -268,7 +261,7 @@ cc_library(
         "hash.h",
     ],
     deps = [
-        ":integral_types",
+        ":types",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -279,12 +272,6 @@ cc_library(
     deps = [":base"],
 )
 
-cc_library(
-    name = "integral_types",
-    hdrs = ["integral_types.h"],
-    deps = [":types"],
-)
-
 cc_library(
     name = "intops",
     hdrs = ["strong_int.h"],
@@ -330,11 +317,6 @@ cc_library(
     ],
 )
 
-cc_library(
-    name = "types",
-    hdrs = ["types.h"],
-)
-
 cc_library(
     name = "vlog",
     srcs = ["vlog_is_on.cc"],
@@ -343,7 +325,7 @@ cc_library(
         "vlog_is_on.h",
     ],
     deps = [
-        ":integral_types",
+        ":types",
         "@com_google_absl//absl/flags:flag",
         "@com_google_absl//absl/log",
         "@com_google_absl//absl/log:check",
@@ -366,7 +348,7 @@ cc_library(
     hdrs = ["mathutil.h"],
     deps = [
         ":base",
-        ":basictypes",
+        ":types",
     ],
 )
 
@@ -501,7 +483,7 @@ cc_library(
     srcs = ["strtoint.cc"],
     hdrs = ["strtoint.h"],
     deps = [
-        ":integral_types",
+        ":types",
         "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/strings",
     ],
@@ -512,7 +494,7 @@ cc_library(
     srcs = ["sysinfo.cc"],
     hdrs = ["sysinfo.h"],
     deps = [
-        ":integral_types",
+        ":types",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -532,7 +514,7 @@ cc_library(
     srcs = ["timer.cc"],
     hdrs = ["timer.h"],
     deps = [
-        ":integral_types",
+        ":types",
         ":macros",
         "@com_google_absl//absl/log:check",
         "@com_google_absl//absl/time",
@@ -549,7 +531,7 @@ cc_library(
     srcs = ["zipfile.cc"],
     hdrs = ["zipfile.h"],
     deps = [
-        ":basictypes",
+        ":types",
         ":file",
         ":path",
         ":stl_util",

diff --git a/ortools/base/adjustable_priority_queue.h b/ortools/base/adjustable_priority_queue.h
@@ -20,7 +20,7 @@
 #include <list>
 #include <vector>
 
-#include "ortools/base/basictypes.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/macros.h"
 

diff --git a/ortools/base/base.i b/ortools/base/base.i
@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 %}
 
 %include "typemaps.i"

diff --git a/ortools/base/basictypes.h b/ortools/base/basictypes.h
diff --git a/ortools/base/bitmap.cc b/ortools/base/bitmap.cc
@@ -15,7 +15,7 @@
 
 #include <algorithm>
 
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 
 namespace operations_research {
 

diff --git a/ortools/base/bitmap.h b/ortools/base/bitmap.h
@@ -17,7 +17,7 @@
 #include <cassert>
 #include <cstring>
 
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 
 namespace operations_research {
 namespace internal {

diff --git a/ortools/base/container_logging.h b/ortools/base/container_logging.h
@@ -41,7 +41,7 @@
 #include <type_traits>
 
 #include "absl/base/port.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 
 namespace gtl {
 

diff --git a/ortools/base/file.h b/ortools/base/file.h
@@ -24,7 +24,7 @@
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 #include "ortools/base/logging.h"
 #include "ortools/base/status_macros.h"
 

diff --git a/ortools/base/gzipfile.h b/ortools/base/gzipfile.h
@@ -15,7 +15,7 @@
 #define OR_TOOLS_BASE_GZIPFILE_H_
 
 #include "absl/strings/string_view.h"
-#include "ortools/base/basictypes.h"  // for Ownership enum
+#include "ortools/base/types.h"  // for Ownership enum
 #include "zlib.h"                     // for Z_DEFAULT_COMPRESSION
 
 class File;

diff --git a/ortools/base/hash.h b/ortools/base/hash.h
@@ -18,7 +18,7 @@
 #include <string>
 #include <utility>
 
-#include "ortools/base/integral_types.h"
+#include "ortools/base/types.h"
 
 // In SWIG mode, we don't want anything besides these top-level includes.
 #if !defined(SWIG)