Merge branch 'main' of github.com:google/or-tools

examples/cpp/nqueens.cc

@@ -29,6 +29,7 @@
 #include "ortools/base/logging.h"
 #include "ortools/base/map_util.h"
 #include "ortools/base/types.h"
+#include "ortools/constraint_solver/constraint_solver.h"
 #include "ortools/constraint_solver/constraint_solveri.h"
 
 ABSL_FLAG(bool, print, false, "If true, print one of the solution.");
@@ -39,7 +40,6 @@ ABSL_FLAG(
     int, size, 0,
     "Size of the problem. If equal to 0, will test several increasing sizes.");
 ABSL_FLAG(bool, use_symmetry, false, "Use Symmetry Breaking methods");
-ABSL_DECLARE_FLAG(bool, cp_disable_solve);
 
 static const int kNumSolutions[] = {
     1, 0, 0, 2, 10, 4, 40, 92, 352, 724, 2680, 14200, 73712, 365596, 2279184};

go.mod

@@ -3,6 +3,6 @@ module github.com/google/or-tools
 go 1.22.2
 
 require (
-	github.com/golang/glog v1.2.2
-	google.golang.org/protobuf v1.36.5
+  github.com/golang/glog v1.2.2
+  google.golang.org/protobuf v1.36.5
 )

ortools/algorithms/python/CMakeLists.txt

@@ -30,3 +30,10 @@ endif()
 
 target_link_libraries(knapsack_solver_pybind11 PRIVATE ${PROJECT_NAMESPACE}::ortools)
 add_library(${PROJECT_NAMESPACE}::knapsack_solver_pybind11 ALIAS knapsack_solver_pybind11)
+
+if(BUILD_TESTING)
+  file(GLOB PYTHON_SRCS "*_test.py")
+  foreach(FILE_NAME IN LISTS PYTHON_SRCS)
+    add_python_test(FILE_NAME ${FILE_NAME})
+  endforeach()
+endif()

tools/doc/gen_ref_doc.py

@@ -161,7 +161,7 @@ def create_section_data():
           'ortools/graph/connectivity.h ' +
           'ortools/graph/eulerian_path.h ' + 'ortools/graph/graph.h ' +
           'ortools/graph/graphs.h ' + 'ortools/graph/hamiltonian_path.h ' +
-          'ortools/graph/io.h ' + 'ortools/graph/iterators.h ' +
+          'ortools/graph/graph_io.h ' + 'ortools/graph/iterators.h ' +
           'ortools/graph/linear_assignment.h ' + 'ortools/graph/max_flow.h ' +
           'ortools/graph/min_cost_flow.h ' +
           'ortools/graph/minimum_spanning_tree.h ' +