Commit Graph

42 Commits

Author SHA1 Message Date
Laurent Perron
aa0d4d023f Merge branch 'master' of https://github.com/google/or-tools 2018-09-12 15:07:26 +02:00
Laurent Perron
428e272ccc add ModelStats and CpSolverResponseStats for SAT/{Python|Java|C#}; enable multiple enforcement literals for a few constraints; small fixes, typo corrections 2018-09-12 15:07:23 +02:00
Corentin Le Molgat
f2989d319d Replace non ASCII character '–' in comments
- Crash on ubuntu 16.04 during 'make java'...
2018-09-10 13:37:04 +02:00
Laurent Perron
0540042344 fix doc #540 2018-09-07 13:20:37 +02:00
Laurent Perron
05d9faf4d7 cleanup; move parallel code from fz to sat 2018-07-03 13:01:37 +02:00
Laurent Perron
c1ab121ff7 ITIVector -> gtl::ITIVector; experimental LNS code for SAT 2018-06-26 21:24:10 +02:00
Laurent Perron
27286f42ae fix 2018-06-11 14:11:53 +02:00
Laurent Perron
92433a8e5d minor refactoring of the code, mostly reindent 2018-06-11 11:50:49 +02:00
Laurent Perron
70e73d8754 clang-format 2018-06-08 16:40:43 +02:00
Corentin Le Molgat
7dda497960 Fix all remaining StrAppend -> absl::StrAppend 2018-06-02 03:05:07 +02:00
Laurent Perron
8623fc3580 speed up sat cumulative; add namespaces to base library + fix code 2018-04-11 13:00:30 +02:00
Laurent Perron
fa09d4949a add SimpleMaxFlow::SetArcCapacity; change to the base library 2018-03-07 11:30:39 +01:00
Laurent Perron
9044de9355 new heuristics to minimize clauses in SAT; base library changes 2018-03-06 18:17:36 +01:00
Corentin Le Molgat
5759af1a97 Move CMake gflags target to its own namespace.
Use gflags::gflags as others deps to be more consistent and modern
2018-02-06 14:16:37 +01:00
Corentin Le Molgat
19ae1c121c Fix python loader_path 2018-01-22 14:33:20 +01:00
Corentin Le Molgat
6856567eda Rework CMakeLists.txt
Dependencies:
- Add dependencies as subprojects instead of prebuild (aka imported target)
- add zlib project
- Use Cbc as CMake subproject instead of prebuilt
- Add log between each subproject
- Force gflags namespace to gflags

Or-tools:
- Rework python.cmake support
- Fix missing ortool.util in python (#558)
- Try to use static library for ortools::proto
pros: can use target_link_libraries to get includes etc...
cons: lot of symbols undefined since libortools.so will strip everything -_-
- Use add_library(XXX OBJECT) for ortools/*
- fix get version from git when using small depth copy
- Create Install rule for ortools
- Don't create export rules
note: since we use subprojects instead of Imported Target,
ortools export complained against target deps "that is not in the export set."

Update windows support
- add swig project
- Protobuf force the use of /MD instead of /MT
- or-tools use /MD by default
- Add missing ws2_32
- Add missing psapi
- Update windows disable warnings list
- Build Static or-tools on Windows
- fix windows export symbols leak issue

Signed-off-by: Corentin Le Molgat <corentinl@google.com>
2018-01-19 15:03:25 +01:00
Laurent Perron
88ef3d0302 remove std:: from std::min|max in comments; performance improvements on the SAT, bug fixes 2018-01-10 13:21:06 +01:00
Laurent Perron
6d29dc9030 fix vs compilation: missing #include <algorithm> 2017-12-19 10:07:30 +01:00
Laurent Perron
703fe45f0b fix typos 2017-12-14 12:46:10 +01:00
Laurent Perron
8d7320b962 deep sync with base library; prepare for abseil.io integration 2017-12-08 14:52:49 +01:00
Laurent Perron
e14ee86de3 move rcpsp parser to ortools/data; continue working on SAT 2017-11-07 15:45:52 +01:00
Laurent Perron
03fccb4032 improve incrementality of glop when used in the sat solver; change more copyright dates; more documentation on the gate scheduling problem 2017-10-18 11:09:13 +02:00
Laurent Perron
2c7a8bf8f6 change copyright date 2017-10-17 13:08:10 +02:00
Laurent Perron
394bbe232a move graph code around; improve internals of sat solver 2017-10-09 11:21:43 -07:00
Laurent Perron
086640da72 move graph code around; improve sat code 2017-09-29 15:08:48 +02:00
Laurent Perron
9a299d7fae minor improvement to internal comments 2017-09-08 13:58:10 +02:00
Laurent Perron
a223dc2f82 fix linear_assignment big 2017-09-08 13:57:39 +02:00
Laurent Perron
e42ef1e06e cleanups and minor syncs; sat: add LP guided heuristics 2017-08-03 10:20:59 -07:00
Laurent Perron
9c92556791 minor adjustments with internal code 2017-08-02 14:15:55 -07:00
Laurent Perron
12234acc02 minor sync with internal code 2017-08-02 10:41:27 -07:00
Laurent Perron
ce771a90aa fix bazel build 2017-06-08 12:48:45 +02:00
Amit Prakash Ambasta
553772d03c Removed python build for cleaner patches 2017-05-31 12:00:50 +05:30
Amit Prakash Ambasta
54fb40e545 Call .get() on unique_ptr so that cast to T* is possible 2017-05-30 16:26:30 +05:30
Amit Prakash Ambasta
72e3313784 Updated CMakeLists to retain hierarchy of proto generated files 2017-05-30 15:51:19 +05:30
Amit Prakash Ambasta
2a12468b93 Added cmake support for C++, initial python build support 2017-05-30 12:02:56 +05:30
Laurent Perron
c7d9318c75 more cleanup 2017-04-28 16:17:22 +02:00
Laurent Perron
8c08d72260 replace hash_map and hash_set by unordered_map and unordered_set 2017-04-27 17:34:24 +02:00
Laurent Perron
4db7d3bc4e remove hash_map/hash_set; replace with std::unordered_map|set 2017-04-27 14:14:05 +02:00
Laurent Perron
ad6518ea8b more compilation fixes 2017-04-27 09:35:32 +02:00
Laurent Perron
9f6e447d00 fix bazel build 2017-04-27 09:06:18 +02:00
Laurent Perron
84e8058255 single workspace architecture for bazel after include earthquake 2017-04-26 22:30:32 +02:00
Laurent Perron
66b8d23079 move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files 2017-04-26 17:30:25 +02:00