Laurent Perron
6d8c32ca7b
fix
2025-06-20 15:45:27 +02:00
Laurent Perron
c14e54cf82
[CP-SAT] print a solution after a SIGTERM; improve precedences
2025-06-20 15:11:37 +02:00
Laurent Perron
7a4222652e
:wq
...
Merge branch 'main' of github.com:google/or-tools
2025-06-19 15:06:11 +02:00
Corentin Le Molgat
6ceb6d401e
tools/release: more cleanup
2025-06-19 14:48:50 +02:00
Laurent Perron
9888ce3da1
polish third_party_solvers; speed up cp-sat on no_ovrlap_2d
2025-06-19 14:08:49 +02:00
Corentin Le Molgat
3434ae4839
tools/release: fixup
2025-06-19 13:44:50 +02:00
Corentin Le Molgat
3365d1636c
routing: export from google3
2025-06-19 13:44:50 +02:00
Corentin Le Molgat
f1e95386d1
cmake: Fix cmake_minimum_required to 3.24 ( #4692 )
2025-06-19 13:44:50 +02:00
Laurent Perron
c4fd63cd61
Merge pull request #4697 from clementperon/fix_compat_protobuf
...
Fix compat with protobuf < 5.26
2025-06-18 21:33:15 +02:00
Laurent Perron
fa616a67ec
Merge pull request #4696 from clementperon/fix_compilation_cpp17
...
Fix compilation with iterator with C++ 17
2025-06-18 21:32:50 +02:00
Clément Péron
91e14de1f7
ortools: utils: keep compatibility with protobuf < 26
2025-06-18 18:27:32 +02:00
Laurent Perron
b61ec9860c
reorganize gurobi and xpress side loading
2025-06-18 18:22:06 +02:00
Laurent Perron
c4b01c1294
reorganize gurobi and xpress side loading
2025-06-18 18:20:30 +02:00
Clément Péron
966a59755d
graph: fix iterator compatibility since C++17
...
Add missing iterator typedefs to custom iterator classes when std::iterator
inheritance is deprecated since C++17.
Signed-off-by: Clément Péron <peron.clem@gmail.com >
2025-06-18 17:42:04 +02:00
Laurent Perron
e995b1ad7a
remove model_builder support for xpress as it is not implemented; move gurobi_util to linear_solver
2025-06-17 13:41:54 +02:00
Laurent Perron
8049f0387d
Merge branch 'main' of github.com:google/or-tools
2025-06-17 12:51:46 +02:00
Laurent Perron
e76ecdf237
minor cleaning
2025-06-17 12:48:42 +02:00
Laurent Perron
e3d4f349fe
[CP-SAT] more work on precedences; and no_overlap_2d
2025-06-17 12:48:24 +02:00
Laurent Perron
1c81bd833c
more gscip cleaning
2025-06-17 12:47:56 +02:00
Laurent Perron
20f14fa745
misc doc change
2025-06-17 12:47:41 +02:00
Laurent Perron
ac0fe62544
gscip cleanup; linear_solver samples reident
2025-06-17 12:47:23 +02:00
Mizux Seiha
3467396a74
dependencies: bump Protobuf from v31.0 to v31.1
2025-06-17 12:32:17 +02:00
Corentin Le Molgat
7b67f855e6
cleanup and formatting
2025-06-16 17:55:56 +02:00
Corentin Le Molgat
79b86cc581
constraint_solver: export from google3
2025-06-16 15:34:01 +02:00
Corentin Le Molgat
35ee27b271
graph: export from google3
...
dump_vars: Add support for StrongInt and StrongVector
2025-06-16 15:33:46 +02:00
Florian OMNES
2524635377
Fix bz2.dll install path for windows-cpp archive
2025-06-16 11:50:21 +02:00
Corentin Le Molgat
9831cdb403
tools/release: add python build log
2025-06-16 11:50:13 +02:00
Corentin Le Molgat
dd9029afdb
tools/release: Workaround for macos x86_64 python build failure
2025-06-16 11:50:07 +02:00
Corentin Le Molgat
8a2a537cc5
cmake: format samples
2025-06-16 11:48:43 +02:00
Laurent Perron
63b9ecdfd7
[CP-SAT] tweak and improve code
2025-06-13 13:14:13 +02:00
Laurent Perron
8ff5dbee6a
[CP-SAT] split intervals in disjoint sets for scheduling cuts
2025-06-13 13:13:51 +02:00
Laurent Perron
8abc6da4dd
cleanup python expression code for cp-sat and model-builder
2025-06-13 13:13:26 +02:00
Laurent Perron
4953c79d18
[CP-SAT] more work on precedences
2025-06-12 14:05:23 +02:00
Laurent Perron
b1d5100c3b
improve python exprs
2025-06-12 14:04:51 +02:00
Laurent Perron
7d58c118f6
improve python exprs
2025-06-12 11:52:00 +02:00
Laurent Perron
43c874a733
fix
2025-06-12 11:18:26 +02:00
Laurent Perron
6270850326
bump minizinc challenge tag
2025-06-12 11:11:48 +02:00
Laurent Perron
d1c3c7f84b
[CP-SAT] more work on precedences
2025-06-12 11:11:26 +02:00
Laurent Perron
c229e9facd
[CP-SAT] improve python layer for += and -= operators
2025-06-12 11:11:12 +02:00
Corentin Le Molgat
c1f2d74de9
dependencies: Fix MACOSX_RPATH usage ( #4674 )
...
1. This is a boolean property which must be set to TRUE or FALSE
If TRUE, the default, cmake will use @rpath as directory portion (aka prefix) of the install_name (otool LC_ID_DYLIB)
note: CMP0042 set it to TRUE by default
2. To change this prefix you must use INSTALL_NAME_DIR
3. To change the INSTALL_RPATH (otool LC_RPATH) (e.g. to set it to @loader_path) you must use the INSTALL_RPATH property.
ref:
https://cmake.org/cmake/help/latest/variable/CMAKE_MACOSX_RPATH.html
https://cmake.org/cmake/help/latest/prop_tgt/MACOSX_RPATH.html
https://cmake.org/cmake/help/latest/prop_tgt/INSTALL_RPATH.html
https://cmake.org/cmake/help/latest/policy/CMP0042.html
2025-06-11 18:19:58 +02:00
Corentin Le Molgat
4d9ef15b24
tools/release: Detect /Users path in libortools.dylib ( #4674 )
2025-06-11 18:19:58 +02:00
Corentin Le Molgat
afbb56379c
make: Enable HiGHS support by default
2025-06-11 18:19:58 +02:00
Laurent Perron
ef630e7b7b
Merge branch 'main' of github.com:google/or-tools
2025-06-11 15:14:52 +02:00
Laurent Perron
9ca57ad2cd
[CP-SAT] more precedence handling; minor python improvements
2025-06-11 15:03:52 +02:00
Laurent Perron
e25617bac8
reindent; span
2025-06-11 15:03:14 +02:00
Clément Péron
f8f4651d76
cmake: Add support for custom protoc executable via OR_TOOLS_PROTOC_EXECUTABLE
...
Allow users to specify a custom protoc executable by setting the
OR_TOOLS_PROTOC_EXECUTABLE variable, which takes precedence over
the default cross-compilation and system protoc detection logic.
Signed-off-by: Clément Péron <peron.clem@gmail.com >
2025-06-11 13:41:04 +02:00
Mizux
8b82db1849
Update README.md
...
cmake: Fix README.md for GFM
note: code markdown preview do not have the same behaviour...
2025-06-11 13:24:56 +02:00
Corentin Le Molgat
9956831a04
cmake: Fix README.md
2025-06-11 13:21:25 +02:00
Laurent Perron
d3617d58b2
proper fix
2025-06-11 12:44:21 +02:00
Laurent Perron
64fcba4be7
[CP-SAT] work on precedences; fix bug in scheduling cuts
2025-06-10 17:25:55 +02:00
