Bump math_opt

ortools/math_opt/cpp/BUILD.bazel

@@ -4,29 +4,32 @@ package(default_visibility = ["//ortools/math_opt:__subpackages__"])
 
 cc_library(
     name = "math_opt",
-    srcs = ["math_opt.cc"],
     hdrs = ["math_opt.h"],
     visibility = ["//visibility:public"],
     deps = [
-        ":callback",
+        ":model",
+        ":solve",
+    ],
+)
+
+cc_library(
+    name = "model",
+    srcs = ["model.cc"],
+    hdrs = ["model.h"],
+    deps = [
         ":key_types",
         ":linear_constraint",
-        ":model_solve_parameters",
-        ":objective",
-        ":result",
+        ":update_tracker",
         ":variable_and_expressions",
         "//ortools/base",
-        "//ortools/base:int_type",
         "//ortools/base:status_macros",
-        "//ortools/math_opt:callback_cc_proto",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/base:int_type",
         "//ortools/math_opt:model_cc_proto",
         "//ortools/math_opt:model_update_cc_proto",
-        "//ortools/math_opt:parameters_cc_proto",
-        "//ortools/math_opt:result_cc_proto",
-        "//ortools/math_opt/core:solver",
-        "@com_google_absl//absl/container:flat_hash_set",
+        "//ortools/math_opt/core:model_storage",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
     ],
@@ -36,11 +39,11 @@ cc_library(
     name = "id_map",
     hdrs = ["id_map.h"],
     deps = [
-        ":arrow_operator_proxy",
         ":key_types",
         "//ortools/base",
         "//ortools/base:int_type",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/math_opt/core:arrow_operator_proxy",
+        "//ortools/math_opt/core:model_storage",
         "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/types:span",
@@ -57,7 +60,7 @@ cc_library(
         "//ortools/base",
         "//ortools/base:int_type",
         "//ortools/base:map_util",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/math_opt/core:model_storage",
         "@com_google_absl//absl/base:core_headers",
         "@com_google_absl//absl/container:flat_hash_map",
     ],
@@ -65,7 +68,6 @@ cc_library(
 
 cc_library(
     name = "linear_constraint",
-    srcs = ["linear_constraint.cc"],
     hdrs = ["linear_constraint.h"],
     deps = [
         ":id_map",
@@ -73,37 +75,52 @@ cc_library(
         ":variable_and_expressions",
         "//ortools/base",
         "//ortools/base:int_type",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/math_opt/core:model_storage",
     ],
 )
 
 cc_library(
-    name = "objective",
-    srcs = ["objective.cc"],
-    hdrs = ["objective.h"],
-    deps = [
-        ":key_types",
-        ":variable_and_expressions",
-        "//ortools/base",
-        "//ortools/math_opt/core:indexed_model",
-        "@com_google_absl//absl/container:flat_hash_map",
-    ],
-)
-
-cc_library(
-    name = "result",
-    srcs = ["result.cc"],
-    hdrs = ["result.h"],
+    name = "solution",
+    srcs = ["solution.cc"],
+    hdrs = ["solution.h"],
     deps = [
+        ":enums",
         ":linear_constraint",
         ":variable_and_expressions",
         "//ortools/base",
-        "//ortools/base:protoutil",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/base:int_type",
         "//ortools/math_opt:result_cc_proto",
         "//ortools/math_opt:solution_cc_proto",
+        "//ortools/math_opt/core:model_storage",
+        "//ortools/math_opt/core:sparse_vector_view",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:optional",
+        "@com_google_absl//absl/types:span",
+    ],
+)
+
+cc_library(
+    name = "solve_result",
+    srcs = ["solve_result.cc"],
+    hdrs = ["solve_result.h"],
+    deps = [
+        ":enums",
+        ":linear_constraint",
+        ":solution",
+        ":variable_and_expressions",
+        "//ortools/base",
+        "//ortools/base:status_macros",
+        "//ortools/base:protoutil",
+        "//ortools/math_opt:result_cc_proto",
+        "//ortools/math_opt:solution_cc_proto",
+        "//ortools/math_opt/core:model_storage",
+        "//ortools/port:proto_utils",
+        "@com_google_absl//absl/container:flat_hash_map",
         "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
         "@com_google_absl//absl/time",
+        "@com_google_absl//absl/types:span",
     ],
 )
 
@@ -112,9 +129,9 @@ cc_library(
     hdrs = ["map_filter.h"],
     deps = [
         ":id_set",
+        "//ortools/base:int_type",
         "//ortools/math_opt:sparse_containers_cc_proto",
-        "//ortools/math_opt/core:indexed_model",
-        "@com_google_absl//absl/types:optional",
+        "//ortools/math_opt/core:model_storage",
     ],
 )
 
@@ -123,6 +140,7 @@ cc_library(
     srcs = ["callback.cc"],
     hdrs = ["callback.h"],
     deps = [
+        ":enums",
         ":key_types",
         ":map_filter",
         ":variable_and_expressions",
@@ -131,29 +149,24 @@ cc_library(
         "//ortools/base:protoutil",
         "//ortools/base:status_macros",
         "//ortools/math_opt:callback_cc_proto",
-        "//ortools/math_opt/core:indexed_model",
         "//ortools/math_opt:solution_cc_proto",
         "//ortools/math_opt:sparse_containers_cc_proto",
+        "//ortools/math_opt/core:model_storage",
         "//ortools/math_opt/core:sparse_vector_view",
         "@com_google_absl//absl/container:flat_hash_set",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/time",
-        "@com_google_absl//absl/types:optional",
+        "@com_google_absl//absl/types:span",
     ],
 )
 
-cc_library(
-    name = "arrow_operator_proxy",
-    hdrs = ["arrow_operator_proxy.h"],
-)
-
 cc_library(
     name = "key_types",
     hdrs = ["key_types.h"],
     deps = [
         "//ortools/base",
-        "//ortools/math_opt/core:indexed_model",
+        "//ortools/math_opt/core:model_storage",
         "@com_google_absl//absl/strings",
     ],
 )
@@ -162,14 +175,11 @@ cc_library(
     name = "id_set",
     hdrs = ["id_set.h"],
     deps = [
-        ":arrow_operator_proxy",
         ":key_types",
-        ":result",
         "//ortools/base",
-        "//ortools/math_opt/core:indexed_model",
-        "//ortools/math_opt:solution_cc_proto",
+        "//ortools/math_opt/core:arrow_operator_proxy",
+        "//ortools/math_opt/core:model_storage",
         "@com_google_absl//absl/container:flat_hash_set",
-        "@com_google_protobuf//:protobuf",
     ],
 )
 
@@ -181,12 +191,102 @@ cc_library(
         ":key_types",
         ":linear_constraint",
         ":map_filter",
-        ":result",
+        ":solution",
         ":variable_and_expressions",
-        "//ortools/math_opt/core:indexed_model",
         "//ortools/math_opt:model_parameters_cc_proto",
         "//ortools/math_opt:solution_cc_proto",
         "//ortools/math_opt:sparse_containers_cc_proto",
+        "//ortools/math_opt/core:model_storage",
         "@com_google_protobuf//:protobuf",
     ],
 )
+
+cc_library(
+    name = "update_tracker",
+    srcs = ["update_tracker.cc"],
+    hdrs = ["update_tracker.h"],
+    deps = [
+        "//ortools/base",
+        "//ortools/math_opt:model_cc_proto",
+        "//ortools/math_opt:model_update_cc_proto",
+        "//ortools/math_opt/core:model_storage",
+        "@com_google_absl//absl/strings",
+    ],
+)
+
+cc_library(
+    name = "solve",
+    srcs = ["solve.cc"],
+    hdrs = ["solve.h"],
+    deps = [
+        ":callback",
+        ":key_types",
+        ":model",
+        ":model_solve_parameters",
+        ":parameters",
+        ":solve_result",
+        ":streamable_solver_init_arguments",
+        "//ortools/base",
+        "//ortools/base:status_macros",
+        "//ortools/base:source_location",
+        "//ortools/math_opt:callback_cc_proto",
+        "//ortools/math_opt:parameters_cc_proto",
+        "//ortools/math_opt/core:model_storage",
+        "//ortools/math_opt/core:non_streamable_solver_init_arguments",
+        "//ortools/math_opt/core:solve_interrupter",
+        "//ortools/math_opt/core:solver",
+        "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/memory",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/synchronization",
+        #"@com_google_absl//absl/types:source_location",
+    ],
+)
+
+cc_library(
+    name = "streamable_solver_init_arguments",
+    srcs = ["streamable_solver_init_arguments.cc"],
+    hdrs = ["streamable_solver_init_arguments.h"],
+    deps = [
+        "//ortools/math_opt:parameters_cc_proto",
+        "//ortools/math_opt/solvers:gurobi_cc_proto",
+    ],
+)
+
+cc_library(
+    name = "parameters",
+    srcs = ["parameters.cc"],
+    hdrs = ["parameters.h"],
+    deps = [
+        ":enums",
+        "//ortools/base:linked_hash_map",
+        "//ortools/base:status_macros",
+        "//ortools/base:protoutil",
+        "//ortools/glop:parameters_cc_proto",
+        "//ortools/gscip:gscip_cc_proto",
+        "//ortools/math_opt:parameters_cc_proto",
+        "//ortools/math_opt/solvers:gurobi_cc_proto",
+        #"//ortools/math_opt/solvers:osqp_settings_cc_proto",
+        #"//ortools/pdlp:solvers_cc_proto",
+        "//ortools/port:proto_utils",
+        "//ortools/sat:sat_parameters_cc_proto",
+        "@com_google_absl//absl/status",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/time",
+        "@com_google_absl//absl/types:span",
+    ],
+)
+
+cc_library(
+    name = "enums",
+    hdrs = ["enums.h"],
+    deps = [
+        "//ortools/base",
+        "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:span",
+    ],
+)