Commit Graph

7620 Commits

Author SHA1 Message Date
Laurent Perron
4ba76781a1 Merge branch 'master' of github.com:google/or-tools 2020-03-19 00:24:27 +01:00
Laurent Perron
a0cc52731e expand table constraints; improve cut management; speed up presolve 2020-03-19 00:24:10 +01:00
Gaurav Singh
8232d39b69 Check(demon!=nullptr) before accessing demon-> 2020-03-18 12:10:36 +01:00
Gaurav Singh
5161b175f3 [Efficiency] Catch exception by reference 2020-03-18 11:21:37 +01:00
Corentin Le Molgat
0b2bb263ae Update Makefile.gen.mk 2020-03-16 11:15:17 +01:00
Corentin Le Molgat
0d6f6dddd9 Export g3 -> gh 2020-03-12 18:20:13 +01:00
Laurent Perron
0ba997ada1 speed up cut management; expand negated table constraints 2020-03-11 17:53:22 +01:00
Corentin Le Molgat
fc9553af86 Add Dockerfile to test bazel build 2020-03-10 17:53:36 +01:00
Corentin Le Molgat
b220388578 Fixup bazel 2020-03-10 17:30:11 +01:00
Corentin Le Molgat
cf2791b725 Fix C++17 issue 2020-03-10 15:27:52 +01:00
Corentin Le Molgat
2d8c863c2a Sync g3 -> gh Part 3 2020-03-10 11:06:08 +01:00
Corentin Le Molgat
22356ff523 Sync g3 -> gh part_2 2020-03-09 18:34:21 +01:00
Corentin Le Molgat
b587d27a4a Sync g3 -> gh 2020-03-09 14:09:26 +01:00
Corentin Le Molgat
baeb4544c7 Revert "Remove uneeded patches"
This reverts commit 973e7b98da.
2020-03-09 11:19:49 +01:00
Corentin Le Molgat
df60a0fdc2 Base sync with g3 2020-03-06 18:27:52 +01:00
Corentin Le Molgat
9032f4269a Update cmake/doc/dotnet.md 2020-03-06 18:08:48 +01:00
Corentin Le Molgat
0727d32aa8 Update cmake README.md 2020-03-06 16:16:52 +01:00
Corentin Le Molgat
973e7b98da Remove uneeded patches 2020-03-06 14:59:13 +01:00
Corentin Le Molgat
791cd70285 Sync g3 -> github README.md 2020-03-06 14:10:25 +01:00
Corentin Le Molgat
69f086908d Update minimum CMake version 2020-03-06 14:10:25 +01:00
Corentin Le Molgat
35a85df181 CMake: add CMP0077
Avoid CMake overwriting variables by option default value
e.g. without this policy
`set(BUILD_DEPS ON)` will be overwrite by `option(BUILD_DEPS "..." OFF)`
2020-03-06 11:35:13 +01:00
Corentin Le Molgat
2d56f40b45 Sync against g3 vrp_time_windows 2020-03-05 17:52:54 +01:00
Laurent Perron
c665f53ff2 [CP-SAT] improve cut management; add debugging tools; fix UNSAT bug in presolve 2020-03-05 17:24:49 +01:00
Laurent Perron
16dc985cc0 Merge branch 'master' of github.com:google/or-tools 2020-03-05 16:48:44 +01:00
Laurent Perron
b74478dbea fix #1908 2020-03-05 16:48:18 +01:00
Corentin Le Molgat
0052d236a9 CMake:dotnet Fix csproj generation 2020-03-05 15:44:09 +01:00
Corentin Le Molgat
b17eb8cb4a Update .gitignore 2020-03-05 15:38:56 +01:00
Corentin Le Molgat
e8e0cf0425 Make:dotnet: Add few more *_DIR variables 2020-03-05 15:37:41 +01:00
Corentin Le Molgat
15afa43e65 Make:dotnet: Rename NATIVE_NUPKG -> RUNTIME_NUPKG 2020-03-05 15:20:30 +01:00
Corentin Le Molgat
c81dd15a15 Make:dotnet: add variable to csproj.in
Change needed since CMake build out of the source tree
i.e. path are differents
2020-03-05 15:19:55 +01:00
Corentin Le Molgat
8aff548fca Make: rename few .Net variables 2020-03-05 15:18:21 +01:00
Corentin Le Molgat
8fee57d205 CMake: dotnet rework
.Net: update runtime csproj.in
2020-03-05 15:18:21 +01:00
Corentin Le Molgat
5b6079a6e5 CMake:dotnet: Fix -FPIC management 2020-03-05 15:18:20 +01:00
Corentin Le Molgat
c59444b07e CMake:dotnet Add definition for swig 2020-03-05 15:18:20 +01:00
Corentin Le Molgat
0be0fc7ddd CMake:Java: update 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
dca72db23f CMake:cpp: cleanup 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
1287ce28a1 CMake: comment debug message 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
f2981e11c3 CMake:python: Add missing definition for swig 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
bd60f60a18 Update cmake doc 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
506ebe9679 Cmake: Update Proto comment 2020-03-05 08:43:45 +01:00
Corentin Le Molgat
69c7295289 CMake: update foreach in cpp.cmake 2020-03-04 14:34:34 +01:00
Corentin Le Molgat
7817565452 CMake: Add orLogo.png & Directory.Build.props 2020-03-04 14:34:33 +01:00
Corentin Le Molgat
20c8ee05b8 CMake: fix dotnet_<targets> 2020-03-04 14:34:33 +01:00
Corentin Le Molgat
4a2e02637b Make: Copy orLogo.png to ${SRC_DIR}/ortools/dotnet
needed for CMake since it will use ${BUILD_DIR}/dotnet
2020-03-04 14:34:33 +01:00
Corentin Le Molgat
27121a1068 Update examples/notebook
generated using ./tools/gen_all_notebook.sh
2020-03-04 14:34:33 +01:00
Corentin Le Molgat
e608b65e82 Add generate_all_notebook.sh 2020-03-04 14:34:33 +01:00
Laurent Perron
6e4944b9e2 polish CP-SAT cut management code 2020-03-03 17:06:35 +01:00
Laurent Perron
d7703bc106 fix overflow 2020-03-03 14:53:36 +01:00
Laurent Perron
578afb76ea polish code 2020-03-03 14:44:46 +01:00
Laurent Perron
234d5f19fc simplify code 2020-03-02 18:39:24 +01:00