Commit Graph

77 Commits

Author SHA1 Message Date
Laurent Perron
4caaef3c23 deep sync with base library renaming; lint checking; Speedup sat; new crash procedure for glop 2018-08-28 11:19:49 +02:00
Laurent Perron
cb7aeacfbb reindent 2018-08-01 10:16:33 -07:00
Laurent Perron
49b1bd617c fix crash in presolve; minor reorg of the code 2018-07-27 14:03:55 -07:00
Laurent Perron
9c4be30df0 fix windows 2018-07-25 13:42:42 -07:00
Laurent Perron
76963f4166 add optional template; use it in linear solver; add const in gurobi interface 2018-07-25 10:22:07 -07:00
Laurent Perron
d04c36efee revert const cast removal 2018-07-18 11:54:47 -07:00
Laurent Perron
90bc98acd7 add macro; remove const cast 2018-07-18 10:44:19 -07:00
Laurent Perron
797aed1f4d add hash utility 2018-07-12 17:50:11 -07:00
Laurent Perron
ccbe46d0fc Merge branch 'master' of https://github.com/google/or-tools 2018-07-03 13:12:14 +02:00
Laurent Perron
05d9faf4d7 cleanup; move parallel code from fz to sat 2018-07-03 13:01:37 +02:00
Corentin Le Molgat
fbda4a9044 Fix Python-swig.h cast 2018-07-03 11:03:48 +02:00
Laurent Perron
f48d116e98 improve sat logging 2018-07-02 13:45:47 +02:00
Laurent Perron
89af2a6b61 remove completion heuristic from sat/fz, move it to sat directly; clean up // cp-sat + lns code 2018-06-27 15:59:02 +02:00
Laurent Perron
c1ab121ff7 ITIVector -> gtl::ITIVector; experimental LNS code for SAT 2018-06-26 21:24:10 +02:00
Laurent Perron
ed16cdfd18 reindent 2018-06-22 14:05:08 +02:00
Laurent Perron
8bc9b15959 add missing random function 2018-06-21 13:53:42 +02:00
Laurent Perron
792e8f252e fix windows 2018-06-08 23:42:50 +02:00
Corentin Le Molgat
209ab7cd11 Replace CHECK_NOTNULL -> CHECK for caller ignoring the return value 2018-06-08 17:51:00 +02:00
Laurent Perron
70e73d8754 clang-format 2018-06-08 16:40:43 +02:00
Corentin Le Molgat
d6fd74b4c9 Fixing all remaining StrCat -> absl::StrCat 2018-06-02 03:13:30 +02:00
Laurent Perron
55d906819f add jobshop scheduling proto + parser + sat solver 2018-04-18 13:37:29 +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
8ac56302da small improvements to SAT presolve; fix sat_runner 2018-03-13 17:20:49 +01: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
7aeffaac90 Fix winsock2.h redefinitions (#579) 2018-02-12 13:21:23 +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
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
Corentin Le Molgat
7a71ddcdf4 Windows: add missing Winsock2.h
needed for gethostname()
2018-01-18 13:49:55 +01:00
Laurent Perron
604587eec7 minor changes; change the search parameters in the cp_model.proto 2018-01-15 10:41:09 +01:00
Laurent Perron
d0dabc6f4d complete implementation of inlined vectos 2018-01-10 13:20:24 +01:00
Laurent Perron
3f28560d0a enrich base libraries 2017-12-18 14:27:22 +01:00
Laurent Perron
bace30695d export base::SetFlag and base::GetFlag; use them in examples 2017-12-14 12:46:53 +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
bb605a1a8a more work on base libraries 2017-12-11 11:02:46 +01:00
Laurent Perron
7d5cb7a3ca fix 2017-12-08 16:12:56 +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
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
Ondrej Sykora
36eda6c5f9 Added -lz to recordio, to fix all the zlib linking problems. 2017-09-05 16:29:10 +02: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
2a64d85317 increase max arity of StrCat 2017-08-01 15:02:15 -07:00
Laurent Perron
8582d92d36 remove ARCH_K8 from makefiles, detect 64 bit inside the code 2017-08-01 10:05:37 -07:00
Laurent Perron
e6b4671295 reindent 2017-07-27 13:45:35 -07:00
Laurent Perron
bca80ba98f fix standalone compilation of base/macris.h 2017-07-27 20:33:57 +02:00