Commit Graph

19 Commits

Author SHA1 Message Date
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
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
Laurent Perron
bd106059e5 support assembly scheduling in the jobshop_scheduling.proto and corresponding examples/cpp/jobshop_sat.cc 2018-05-22 13:13:52 +02:00
Laurent Perron
3656e78877 fix jssp proto compilation 2018-04-19 11:33:20 +02:00
Corentin Le Molgat
0b57edd932 Fix jobshop_scheduling.proto
- wrong types used...
2018-04-19 10:26:59 +02:00
Laurent Perron
55d906819f add jobshop scheduling proto + parser + sat solver 2018-04-18 13:37:29 +02: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
d33bd89c5b add flag for set partition problems 2017-12-18 14:27:05 +01:00
Laurent Perron
07abd68ada fix AnyOf 2017-12-14 12:54:36 +01:00
Laurent Perron
728dba4c7c scp reader/data 2017-12-14 12:50:30 +01:00
Laurent Perron
3af045b0b1 remove ortools/util/filelineiter.h in favor of ortools/base/filelineiter.h 2017-12-11 15:52:26 +01:00
Laurent Perron
cfdaf3972e polish previous CL on base libraries upgrade 2017-12-08 16:08:16 +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
4cd6ecccb3 revisit time limit; add special sigint handler; fix bug in sat presolve with enforcement literals 2017-12-06 11:23:11 +01:00
Laurent Perron
a4a06a357a improve rcpsp parser and rcpsp_sat.py 2017-11-16 17:48:30 +01:00
Laurent Perron
e14ee86de3 move rcpsp parser to ortools/data; continue working on SAT 2017-11-07 15:45:52 +01:00