From nobody Wed Aug 07 18:28:06 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WfJZb2WS3z5SNr0; Wed, 07 Aug 2024 18:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WfJZb0df1z4MJY; Wed, 7 Aug 2024 18:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723055287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKQoqv2WCkoWe+ltdnIuwnFjpM8infcSov4So1ErgKA=; b=UqGhrIH17/KMj3p7gowjM4B8Mhn9OhrVuEB0jH0IOpkmw6QPnu1JhaNz4Xdc7X/8xjmWiY 2Gi+ISEcblFMn3dbnUuP/X0/nFfVozYmcpFoN4/TqjFu1kJ1P3/F6P8qLbK4TWFek5UKyt KKNu0/BEq2JHDHVnv8uUPzkhUoPIQ1oleYzVTF1M9nk2rMQpXjzSAHwNn4FDZn+k3rbzFD K+j/SbyH2p5nJlA84yXeAKCHghuTYzdOIelGRDH75XM8uV+tvrgGx8AW2fZEkJor/iIEGn Hz1m+cg9R5i7/fCWSg48ftjf3OJ1eJLMrCcJkwhbcj8Gse1T3bJZL24Xc3gDZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723055287; a=rsa-sha256; cv=none; b=T9MK1k1zvJbR3ed3VO6Z4s6IWt3DyDijqClWjoEfTJS8k4ek9pR8sfPT+NjtPc9Fxd26g8 6MpxN8YTlGKFH2YfmafjfvurRxLEmJtp1j3cpTfRqoDCi7cSmVqM5AThsxKyGW4FFVBal9 0IuNxhnhnPM8bJ96H4XZlED5c+eUCzDomJo7R6juixhqVK1JTvTI8CTPp1Oun2B1OFcB53 CxIVQBqZsAN6/VpDET4+h7CTrMJGvJOA5s81i5U8HMXNSioYGik4gdzF4RhwSg9Q9N/aZ1 bQYw/pIXUCwLDuvIaDe+eLTy+p+ULbaG/kh7jpT3HSuHMogjsc39kwJPout4CA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723055287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XKQoqv2WCkoWe+ltdnIuwnFjpM8infcSov4So1ErgKA=; b=a0MPdicWklxJ04fWGJ1s49rhVjK0XZJSCwFOareikpCzrHV0zMrvcGSmcRa61QETmwygcZ +Lz3LSTkuVXeDrIqUPGb+N/m0uacWCMKXnjHAq2dlH7Rn/H0RACGrrYYLsBm5C1u27B8dM 9aZPdRXsfbHsgHeUpfRTsCgE3Jg7dc9PVc5nSiNqKezENSVxDtz8NZ1+xseXrGUU6RGv5b bzSijymwrZHFqxtS8JcT5hXC5ICOgUnwWqeRi2cmc7/XKNaZZ0BnVY/HIB7U7iqqlLeK5j d9GBmaayPQWHYVgjMYYFXlP9c8IAxKkEJiPP0fft624MPzwAknqtTdrTyxwdNw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WfJZZ5lBcz11Sg; Wed, 7 Aug 2024 18:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 477IS6lN012377; Wed, 7 Aug 2024 18:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 477IS6t8012374; Wed, 7 Aug 2024 18:28:06 GMT (envelope-from git) Date: Wed, 7 Aug 2024 18:28:06 GMT Message-Id: <202408071828.477IS6t8012374@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 8276b71dfc0e - main - math/or-tools: update the port to version 9.8 (transitory) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8276b71dfc0e450e1555e57aead06b37b0eff3ad Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=8276b71dfc0e450e1555e57aead06b37b0eff3ad commit 8276b71dfc0e450e1555e57aead06b37b0eff3ad Author: Alexey Dokuchaev AuthorDate: 2024-08-07 18:26:46 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-08-07 18:26:46 +0000 math/or-tools: update the port to version 9.8 (transitory) It is not the latest version, but allows to catch up with Abseil C++ libraries update easier; both later versions do not build out of the box for different reasons and require seemingly non-trivial patching. Discussed with: yuri (maintainer) --- math/or-tools/Makefile | 8 ++-- math/or-tools/distinfo | 6 +-- math/or-tools/files/patch-abseil | 20 -------- math/or-tools/pkg-plist | 101 +++++++++++++++++++++++++++++---------- 4 files changed, 83 insertions(+), 52 deletions(-) diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile index bca8839e9eec..907087ee5013 100644 --- a/math/or-tools/Makefile +++ b/math/or-tools/Makefile @@ -1,7 +1,6 @@ PORTNAME= or-tools DISTVERSIONPREFIX= v -DISTVERSION= 9.5 -PORTREVISION= 9 +DISTVERSION= 9.8 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -40,7 +39,7 @@ CXXFLAGS+= -DABSL_LEGACY_THREAD_ANNOTATIONS CONFIGURE_ENV= UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE} OPTIONS_DEFINE= DOCS FLATZINC SCIP -OPTIONS_DEFAULT= FLATZINC #SCIP +#OPTIONS_DEFAULT= FLATZINC SCIP OPTIONS_SUB= yes FLATZINC_DESC= Build FlatZinc - MiniZinc interface @@ -55,6 +54,9 @@ PORTDOCS= * # 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429 +post-patch: + @${REINPLACE_CMD} -e '17,19d' ${WRKSRC}/ortools/base/logging.h + post-install: @${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete diff --git a/math/or-tools/distinfo b/math/or-tools/distinfo index 769e10a9b515..0a2eaa886420 100644 --- a/math/or-tools/distinfo +++ b/math/or-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672576120 -SHA256 (google-or-tools-v9.5_GH0.tar.gz) = 57f81b94949d35dc042690db3fa3f53245cffbf6824656e1a03f103a3623c939 -SIZE (google-or-tools-v9.5_GH0.tar.gz) = 14795911 +TIMESTAMP = 1699869085 +SHA256 (google-or-tools-v9.8_GH0.tar.gz) = 85e10e7acf0a9d9a3b891b9b108f76e252849418c6230daea94ac429af8a4ea4 +SIZE (google-or-tools-v9.8_GH0.tar.gz) = 19725471 diff --git a/math/or-tools/files/patch-abseil b/math/or-tools/files/patch-abseil deleted file mode 100644 index eccc97345062..000000000000 --- a/math/or-tools/files/patch-abseil +++ /dev/null @@ -1,20 +0,0 @@ ---- ortools/lp_data/lp_parser.cc.orig 2022-11-25 09:21:54 UTC -+++ ortools/lp_data/lp_parser.cc -@@ -185,7 +185,7 @@ bool LPParser::ParseIntegerVariablesList(StringPiece l - - bool LPParser::ParseConstraint(StringPiece constraint) { - const StatusOr parsed_constraint_or_status = -- ::operations_research::glop::ParseConstraint(constraint.as_string()); -+ ::operations_research::glop::ParseConstraint(std::string(constraint)); - if (!parsed_constraint_or_status.ok()) return false; - const ParsedConstraint& parsed_constraint = - parsed_constraint_or_status.value(); -@@ -414,7 +414,7 @@ StatusOr ParseConstraint(absl::strin - if (ConsumeToken(&constraint, &consumed_name, &consumed_coeff) != - TokenType::END) { - return absl::InvalidArgumentError(absl::StrCat( -- "End of input was expected, found: ", constraint.as_string())); -+ "End of input was expected, found: ", std::string(constraint))); - } - } - diff --git a/math/or-tools/pkg-plist b/math/or-tools/pkg-plist index 9e5e1a7fe484..f398a995eafa 100644 --- a/math/or-tools/pkg-plist +++ b/math/or-tools/pkg-plist @@ -1,11 +1,22 @@ %%FLATZINC%%bin/fzn-ortools +bin/sat_runner +bin/solve +include/ortools/algorithms/binary_indexed_tree.h +include/ortools/algorithms/binary_search.h include/ortools/algorithms/dense_doubly_linked_list.h +include/ortools/algorithms/duplicate_remover.h include/ortools/algorithms/dynamic_partition.h include/ortools/algorithms/dynamic_permutation.h include/ortools/algorithms/find_graph_symmetries.h include/ortools/algorithms/hungarian.h include/ortools/algorithms/knapsack_solver.h include/ortools/algorithms/knapsack_solver_for_cuts.h +include/ortools/algorithms/python/knapsack_solver_doc.h +include/ortools/algorithms/set_cover.h +include/ortools/algorithms/set_cover_ledger.h +include/ortools/algorithms/set_cover_model.h +include/ortools/algorithms/set_cover_reader.h +include/ortools/algorithms/set_cover_utils.h include/ortools/algorithms/sparse_permutation.h include/ortools/base/accurate_sum.h include/ortools/base/adjustable_priority_queue-inl.h @@ -14,39 +25,27 @@ include/ortools/base/base_export.h include/ortools/base/basictypes.h include/ortools/base/bitmap.h include/ortools/base/case.h -include/ortools/base/check.h include/ortools/base/cleanup.h include/ortools/base/commandlineflags.h include/ortools/base/container_logging.h -include/ortools/base/die_if_null.h include/ortools/base/dump_vars.h include/ortools/base/dynamic_library.h include/ortools/base/encodingutils.h include/ortools/base/file.h include/ortools/base/filesystem.h -include/ortools/base/flags.h include/ortools/base/gzipfile.h include/ortools/base/gzipstring.h include/ortools/base/hash.h include/ortools/base/helpers.h include/ortools/base/init_google.h include/ortools/base/int_type.h -include/ortools/base/integral_types.h include/ortools/base/iterator_adaptors.h -include/ortools/base/jniutil.h include/ortools/base/linked_hash_map.h -include/ortools/base/log.h -include/ortools/base/log_severity.h include/ortools/base/logging.h -include/ortools/base/logging_export.h -include/ortools/base/logging_extensions.h -include/ortools/base/logging_flags.h -include/ortools/base/logging_utilities.h include/ortools/base/macros.h include/ortools/base/map_util.h include/ortools/base/mathutil.h include/ortools/base/memfile.h -include/ortools/base/mock-log.h include/ortools/base/murmur.h include/ortools/base/mutable_memfile.h include/ortools/base/numbers.h @@ -56,7 +55,6 @@ include/ortools/base/protobuf_util.h include/ortools/base/protoutil.h include/ortools/base/ptr_util.h include/ortools/base/python-swig.h -include/ortools/base/raw_logging.h include/ortools/base/recordio.h include/ortools/base/small_map.h include/ortools/base/source_location.h @@ -71,7 +69,9 @@ include/ortools/base/sysinfo.h include/ortools/base/threadpool.h include/ortools/base/timer.h include/ortools/base/typeid.h +include/ortools/base/types.h include/ortools/base/version.h +include/ortools/base/vlog.h include/ortools/base/vlog_is_on.h include/ortools/base/zipfile.h include/ortools/bop/bop_base.h @@ -92,16 +92,19 @@ include/ortools/constraint_solver/constraint_solveri.h include/ortools/constraint_solver/demon_profiler.pb.h include/ortools/constraint_solver/java/javawrapcp_util.h include/ortools/constraint_solver/routing.h +include/ortools/constraint_solver/routing_constraints.h +include/ortools/constraint_solver/routing_decision_builders.h include/ortools/constraint_solver/routing_enums.pb.h include/ortools/constraint_solver/routing_filters.h -include/ortools/constraint_solver/routing_flags.h include/ortools/constraint_solver/routing_index_manager.h +include/ortools/constraint_solver/routing_insertion_lns.h include/ortools/constraint_solver/routing_lp_scheduling.h include/ortools/constraint_solver/routing_neighborhoods.h include/ortools/constraint_solver/routing_parameters.h include/ortools/constraint_solver/routing_parameters.pb.h include/ortools/constraint_solver/routing_search.h include/ortools/constraint_solver/routing_types.h +include/ortools/constraint_solver/routing_utils.h include/ortools/constraint_solver/search_limit.pb.h include/ortools/constraint_solver/search_stats.pb.h include/ortools/constraint_solver/solver_parameters.pb.h @@ -119,6 +122,7 @@ include/ortools/glop/lp_solver.h include/ortools/glop/lu_factorization.h include/ortools/glop/markowitz.h include/ortools/glop/parameters.pb.h +include/ortools/glop/parameters_validation.h include/ortools/glop/preprocessor.h include/ortools/glop/pricing.h include/ortools/glop/primal_edge_norms.h @@ -148,13 +152,17 @@ include/ortools/graph/linear_assignment.h include/ortools/graph/max_flow.h include/ortools/graph/min_cost_flow.h include/ortools/graph/minimum_spanning_tree.h +include/ortools/graph/multi_dijkstra.h include/ortools/graph/one_tree_lower_bound.h include/ortools/graph/perfect_matching.h -include/ortools/graph/shortestpaths.h +include/ortools/graph/shortest_paths.h include/ortools/graph/strongly_connected_components.h include/ortools/graph/topologicalsorter.h include/ortools/graph/util.h include/ortools/gscip/gscip.h +include/ortools/gscip/gscip.pb.h +include/ortools/gscip/gscip_callback_result.h +include/ortools/gscip/gscip_constraint_handler.h include/ortools/gscip/gscip_event_handler.h include/ortools/gscip/gscip_ext.h include/ortools/gscip/gscip_message_handler.h @@ -162,6 +170,7 @@ include/ortools/gscip/gscip_parameters.h include/ortools/gscip/legacy_scip_params.h include/ortools/gurobi/environment.h include/ortools/init/init.h +include/ortools/init/python/init_doc.h include/ortools/linear_solver/glop_utils.h include/ortools/linear_solver/linear_expr.h include/ortools/linear_solver/linear_solver.h @@ -190,19 +199,25 @@ include/ortools/lp_data/matrix_scaler.h include/ortools/lp_data/matrix_utils.h include/ortools/lp_data/model_reader.h include/ortools/lp_data/mps_reader.h +include/ortools/lp_data/mps_reader_template.h include/ortools/lp_data/permutation.h include/ortools/lp_data/proto_utils.h include/ortools/lp_data/scattered_vector.h +include/ortools/lp_data/sol_reader.h include/ortools/lp_data/sparse.h include/ortools/lp_data/sparse_column.h include/ortools/lp_data/sparse_row.h include/ortools/lp_data/sparse_vector.h +include/ortools/math_opt/callback.pb.h include/ortools/math_opt/constraints/indicator/indicator_constraint.h include/ortools/math_opt/constraints/indicator/storage.h include/ortools/math_opt/constraints/indicator/validator.h include/ortools/math_opt/constraints/quadratic/quadratic_constraint.h include/ortools/math_opt/constraints/quadratic/storage.h include/ortools/math_opt/constraints/quadratic/validator.h +include/ortools/math_opt/constraints/second_order_cone/second_order_cone_constraint.h +include/ortools/math_opt/constraints/second_order_cone/storage.h +include/ortools/math_opt/constraints/second_order_cone/validator.h include/ortools/math_opt/constraints/sos/sos1_constraint.h include/ortools/math_opt/constraints/sos/sos2_constraint.h include/ortools/math_opt/constraints/sos/storage.h @@ -210,6 +225,9 @@ include/ortools/math_opt/constraints/sos/util.h include/ortools/math_opt/constraints/sos/validator.h include/ortools/math_opt/constraints/util/model_util.h include/ortools/math_opt/core/arrow_operator_proxy.h +include/ortools/math_opt/core/c_api/solver.h +include/ortools/math_opt/core/concurrent_calls_guard.h +include/ortools/math_opt/core/empty_bounds.h include/ortools/math_opt/core/invalid_indicators.h include/ortools/math_opt/core/inverted_bounds.h include/ortools/math_opt/core/math_opt_proto_utils.h @@ -219,24 +237,23 @@ include/ortools/math_opt/core/solve_interrupter.h include/ortools/math_opt/core/solver.h include/ortools/math_opt/core/solver_debug.h include/ortools/math_opt/core/solver_interface.h -include/ortools/math_opt/core/sparse_collection_matchers.h include/ortools/math_opt/core/sparse_submatrix.h include/ortools/math_opt/core/sparse_vector.h include/ortools/math_opt/core/sparse_vector_view.h include/ortools/math_opt/cpp/basis_status.h include/ortools/math_opt/cpp/callback.h +include/ortools/math_opt/cpp/compute_infeasible_subsystem_arguments.h +include/ortools/math_opt/cpp/compute_infeasible_subsystem_result.h include/ortools/math_opt/cpp/enums.h include/ortools/math_opt/cpp/formatters.h -include/ortools/math_opt/cpp/id_map.h -include/ortools/math_opt/cpp/id_set.h include/ortools/math_opt/cpp/key_types.h include/ortools/math_opt/cpp/linear_constraint.h include/ortools/math_opt/cpp/map_filter.h -include/ortools/math_opt/cpp/matchers.h include/ortools/math_opt/cpp/math_opt.h include/ortools/math_opt/cpp/message_callback.h include/ortools/math_opt/cpp/model.h include/ortools/math_opt/cpp/model_solve_parameters.h +include/ortools/math_opt/cpp/objective.h include/ortools/math_opt/cpp/parameters.h include/ortools/math_opt/cpp/solution.h include/ortools/math_opt/cpp/solve.h @@ -246,29 +263,46 @@ include/ortools/math_opt/cpp/solver_init_arguments.h include/ortools/math_opt/cpp/sparse_containers.h include/ortools/math_opt/cpp/statistics.h include/ortools/math_opt/cpp/streamable_solver_init_arguments.h +include/ortools/math_opt/cpp/update_result.h include/ortools/math_opt/cpp/update_tracker.h include/ortools/math_opt/cpp/variable_and_expressions.h +include/ortools/math_opt/infeasible_subsystem.pb.h +include/ortools/math_opt/io/lp_converter.h include/ortools/math_opt/io/mps_converter.h include/ortools/math_opt/io/names_removal.h include/ortools/math_opt/io/proto_converter.h +include/ortools/math_opt/labs/general_constraint_to_mip.h +include/ortools/math_opt/labs/linear_expr_util.h +include/ortools/math_opt/labs/solution_feasibility_checker.h +include/ortools/math_opt/labs/solution_improvement.h +include/ortools/math_opt/model.pb.h +include/ortools/math_opt/model_parameters.pb.h +include/ortools/math_opt/model_update.pb.h +include/ortools/math_opt/parameters.pb.h +include/ortools/math_opt/result.pb.h +include/ortools/math_opt/samples/branch_and_bound.h +include/ortools/math_opt/solution.pb.h include/ortools/math_opt/solvers/cp_sat_solver.h include/ortools/math_opt/solvers/glop_solver.h +include/ortools/math_opt/solvers/glpk.pb.h +include/ortools/math_opt/solvers/glpk/gap.h include/ortools/math_opt/solvers/glpk/glpk_sparse_vector.h include/ortools/math_opt/solvers/glpk/rays.h include/ortools/math_opt/solvers/glpk_solver.h include/ortools/math_opt/solvers/gscip_solver.h include/ortools/math_opt/solvers/gscip_solver_callback.h -include/ortools/math_opt/solvers/gscip_solver_message_callback_handler.h +include/ortools/math_opt/solvers/gurobi.pb.h include/ortools/math_opt/solvers/gurobi/g_gurobi.h include/ortools/math_opt/solvers/gurobi_callback.h include/ortools/math_opt/solvers/gurobi_init_arguments.h include/ortools/math_opt/solvers/gurobi_solver.h +include/ortools/math_opt/solvers/highs.pb.h include/ortools/math_opt/solvers/message_callback_data.h -include/ortools/math_opt/solvers/pdlp_bridge.h -include/ortools/math_opt/solvers/pdlp_solver.h +include/ortools/math_opt/sparse_containers.pb.h include/ortools/math_opt/storage/atomic_constraint_storage.h include/ortools/math_opt/storage/iterators.h include/ortools/math_opt/storage/linear_constraint_storage.h +include/ortools/math_opt/storage/linear_expression_data.h include/ortools/math_opt/storage/model_storage.h include/ortools/math_opt/storage/model_storage_types.h include/ortools/math_opt/storage/objective_storage.h @@ -278,9 +312,11 @@ include/ortools/math_opt/storage/sparse_coefficient_map.h include/ortools/math_opt/storage/sparse_matrix.h include/ortools/math_opt/storage/update_trackers.h include/ortools/math_opt/storage/variable_storage.h +include/ortools/math_opt/tools/file_format_flags.h +include/ortools/math_opt/validators/bounds_and_status_validator.h include/ortools/math_opt/validators/callback_validator.h -include/ortools/math_opt/validators/enum_sets.h include/ortools/math_opt/validators/ids_validator.h +include/ortools/math_opt/validators/infeasible_subsystem_validator.h include/ortools/math_opt/validators/linear_expression_validator.h include/ortools/math_opt/validators/model_parameters_validator.h include/ortools/math_opt/validators/model_validator.h @@ -291,6 +327,7 @@ include/ortools/math_opt/validators/solve_parameters_validator.h include/ortools/math_opt/validators/solve_stats_validator.h include/ortools/math_opt/validators/sparse_matrix_validator.h include/ortools/math_opt/validators/sparse_vector_validator.h +include/ortools/math_opt/validators/termination_validator.h include/ortools/packing/arc_flow_builder.h include/ortools/packing/arc_flow_solver.h include/ortools/packing/binpacking_2d_parser.h @@ -328,6 +365,7 @@ include/ortools/sat/boolean_problem.h include/ortools/sat/boolean_problem.pb.h include/ortools/sat/circuit.h include/ortools/sat/clause.h +include/ortools/sat/constraint_violation.h include/ortools/sat/cp_constraints.h include/ortools/sat/cp_model.h include/ortools/sat/cp_model.pb.h @@ -348,6 +386,7 @@ include/ortools/sat/cumulative.h include/ortools/sat/cumulative_energy.h include/ortools/sat/cuts.h include/ortools/sat/diffn.h +include/ortools/sat/diffn_cuts.h include/ortools/sat/diffn_util.h include/ortools/sat/diophantine.h include/ortools/sat/disjunctive.h @@ -355,6 +394,7 @@ include/ortools/sat/drat_checker.h include/ortools/sat/drat_proof_handler.h include/ortools/sat/drat_writer.h include/ortools/sat/encoding.h +include/ortools/sat/feasibility_jump.h include/ortools/sat/feasibility_pump.h include/ortools/sat/implied_bounds.h include/ortools/sat/inclusion.h @@ -365,12 +405,14 @@ include/ortools/sat/intervals.h include/ortools/sat/lb_tree_search.h include/ortools/sat/linear_constraint.h include/ortools/sat/linear_constraint_manager.h +include/ortools/sat/linear_model.h include/ortools/sat/linear_programming_constraint.h include/ortools/sat/linear_propagation.h include/ortools/sat/linear_relaxation.h include/ortools/sat/lp_utils.h include/ortools/sat/max_hs.h include/ortools/sat/model.h +include/ortools/sat/opb_reader.h include/ortools/sat/optimization.h include/ortools/sat/parameters_validation.h include/ortools/sat/pb_constraint.h @@ -383,13 +425,14 @@ include/ortools/sat/restart.h include/ortools/sat/rins.h include/ortools/sat/routing_cuts.h include/ortools/sat/sat_base.h +include/ortools/sat/sat_cnf_reader.h include/ortools/sat/sat_decision.h include/ortools/sat/sat_inprocessing.h include/ortools/sat/sat_parameters.pb.h include/ortools/sat/sat_solver.h -include/ortools/sat/scheduling_constraints.h include/ortools/sat/scheduling_cuts.h include/ortools/sat/simplification.h +include/ortools/sat/stat_tables.h include/ortools/sat/subsolver.h include/ortools/sat/swig_helper.h include/ortools/sat/symmetry.h @@ -401,6 +444,7 @@ include/ortools/sat/timetable.h include/ortools/sat/timetable_edgefinding.h include/ortools/sat/util.h include/ortools/sat/var_domination.h +include/ortools/sat/work_assignment.h include/ortools/sat/zero_half_cuts.h include/ortools/scheduling/course_scheduling.pb.h include/ortools/scheduling/jobshop_scheduling.pb.h @@ -409,6 +453,8 @@ include/ortools/scheduling/rcpsp.pb.h include/ortools/scheduling/rcpsp_parser.h include/ortools/util/adaptative_parameter_value.h include/ortools/util/affine_relation.h +include/ortools/util/aligned_memory.h +include/ortools/util/aligned_memory_internal.h include/ortools/util/bitset.h include/ortools/util/cached_log.h include/ortools/util/file_util.h @@ -428,6 +474,7 @@ include/ortools/util/parse_proto.h include/ortools/util/permutation.h include/ortools/util/piecewise_linear_function.h include/ortools/util/proto_tools.h +include/ortools/util/python/sorted_interval_list_doc.h include/ortools/util/qap_reader.h include/ortools/util/random_engine.h include/ortools/util/range_minimum_query.h @@ -450,6 +497,8 @@ include/ortools/util/time_limit.h include/ortools/util/tuple_set.h include/ortools/util/vector_map.h include/ortools/util/vector_or_function.h +include/ortools/util/vector_sum.h +include/ortools/util/vector_sum_internal.h include/ortools/util/zvector.h include/ortools_export.h lib/cmake/ortools/modules/FindCbc.cmake @@ -462,10 +511,10 @@ lib/cmake/ortools/ortoolsTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/ortools/ortoolsTargets.cmake lib/libortools.so lib/libortools.so.9 -lib/libortools.so.9.5.9999 +lib/libortools.so.9.8.9999 %%FLATZINC%%lib/libortools_flatzinc.so %%FLATZINC%%lib/libortools_flatzinc.so.9 -%%FLATZINC%%lib/libortools_flatzinc.so.9.5.9999 +%%FLATZINC%%lib/libortools_flatzinc.so.9.8.9999 %%FLATZINC%%share/minizinc/ortools/fzn_all_different_int.mzn %%FLATZINC%%share/minizinc/ortools/fzn_circuit.mzn %%FLATZINC%%share/minizinc/ortools/fzn_cumulative.mzn