always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,873 Commits 2 Branches 0 Tags
ac42c57a8eb1094dea6dc476592ad04dc4e0aa45
Commit Graph

82 Commits

Author SHA1 Message Date
Laurent Perron
4e893e5080 remove solow-halim glop preprocessor as the interface has changed a lot; add a proper domain class for CP-SAT integer variables, rewrite preprocessor and other parts of the solver to use it 2018-10-02 10:35:52 +02:00
Laurent Perron
6b7036832b add missing API on CP-SAT Java interface; polish doc 2018-09-25 13:23:27 +02:00
Laurent Perron
b1da9320f9 enable objective lower bound (when minimizing) on the SAT solver in Python, Java, C#; change objective_value to be double (as in C++) for these languages. 2018-09-20 11:30:19 +02:00
Laurent Perron
c4c6cb6141 remove all optional integer variables from sat code; allow multiple enforcement literals for a few constraints 2018-09-12 16:58:19 +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
Laurent Perron
e888d1cfc4 fix english 2018-09-06 16:56:47 +02:00
Laurent Perron
fcc6a58cf0 improve doc of sat/python 2018-09-06 16:48:13 +02:00
Laurent Perron
d8a3013c5b more work on sat doc, change threshold to choose the LB branching in the sat solver 2018-09-06 15:15:10 +02:00
Laurent Perron
88f3724e27 update sat python doc 2018-09-06 13:13:53 +02:00
Laurent Perron
48df402a6e rewrite CP-SAT solver output during search; improve SAT/Python doc and reference manual 2018-09-06 11:30:04 +02:00
Laurent Perron
f4ed40ec2b improve sat python reference manual 2018-09-05 23:17:21 +02:00
Laurent Perron
ecd1e4b41c improve sat python reference manual 2018-09-05 23:10:44 +02:00
Laurent Perron
8f3c6ae4cb improve sat python reference manual 2018-09-05 22:56:54 +02:00
Laurent Perron
944026c588 improve sat python reference manual 2018-09-05 22:55:21 +02:00
Laurent Perron
60995fe87c improve sat python reference manual 2018-09-05 22:52:59 +02:00
Laurent Perron
36393a1733 remove useless python __init__ 2018-09-05 10:57:27 +02:00
Laurent Perron
9a116eba39 remove SolutionObserver is sat/swig_helper.h; rename WithObserver into WithCallback 2018-09-04 18:47:10 +02:00
Laurent Perron
5824112e27 fix issue 260 for the CP-SAT solver 2018-09-01 08:48:43 +02:00
Laurent Perron
651e44cf0a remove OptionalIntVar from the sat Python API 2018-08-31 16:56:55 +02:00
Laurent Perron
14b0e5de45 fix python sat boolean value method in solution callback. 2018-08-30 17:50:37 +02:00
Laurent Perron
e8d5858e67 revamp sat python solution callback, adds the ability to stop search from the solution callback. 2018-08-30 16:27:58 +02:00
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
cb884c7ddf added channeling sample in sat cookbook 2018-08-13 09:42:31 -07:00
Laurent Perron
b535ae2ab1 polish doc; add more methods to java sat modeling layer 2018-08-08 16:48:26 -07:00
Laurent Perron
823148593e improve cp_model.py doc 2018-08-07 12:09:19 -07:00
Laurent Perron
507cfbea26 revisit Java SAT API; follow Java naming conventions 2018-08-03 16:42:45 -07:00
Laurent Perron
80694b8513 various fixes 2018-08-01 13:14:06 -07:00
Laurent Perron
fb309a2527 [API Change] Remove support for optional int vars in reservoir, use parallel array of boolean literals to indicate presence 2018-08-01 10:17:48 -07:00
Laurent Perron
7f574ac63f add name method to python/C# sat IntVar/IntervalVar 2018-07-16 15:11:18 -07:00
Laurent Perron
bd04f656b3 rename MODEL_SAT to FEASIBLE, MODEL_UNSAT to INFEASIBLE 2018-07-02 15:35:40 +02:00
Laurent Perron
c7bfe03769 allow solver.Value() and solver.BooleanValue() to accept integer arguments 2018-06-20 11:34:20 +02:00
Laurent Perron
9c9da88e96 allow solver.Value() and solver.BooleanValue() to accept integer arguments 2018-06-20 11:24:20 +02:00
Laurent Perron
211e6ab93f more work on sat doc; fix rare bug in sat minor (doc; __str__) improvements to sat/python/cp_model.py 2018-06-05 14:03:01 +02:00
Laurent Perron
2a51c65e97 expand cp_model.py to offer more API on the solution callback; simplify flexible_jobshop_sat.py 2018-05-31 14:50:12 -07:00
Laurent Perron
404e4c5717 relaxed checks on optional intervals in python CP-SAT 2018-05-31 10:51:33 -07:00
Laurent Perron
9402f58d1d change sat internal API; stop ignoring random seed in glop 2018-05-16 13:43:29 +02:00
Laurent Perron
6961e303a8 add search strategy api to sat cp_model.py 2018-03-15 14:58:43 +01:00
Laurent Perron
86791a3f9f add search strategy api to sat cp_model.py 2018-03-15 13:45:10 +01:00
Laurent Perron
f8f66d5c54 add search strategy api to sat cp_model.py 2018-03-15 13:28:31 +01:00
Laurent Perron
936307c3c5 fix bug in cp_model.py 2018-02-22 15:11:31 +01:00
Laurent Perron
4d03d6eb29 fix bug in cp_model.py#AddAutomata 2018-02-16 14:01:56 +01:00
Laurent Perron
7d599039f9 misc improvement on sat python API; enrich sat swig helper; rewrote CpSolver.cs to follow change in SWIG 2018-02-13 17:30:43 +01:00
Laurent Perron
05f03b33c1 improve sat/circuit; various reimplementations 2018-02-12 11:36:18 +01:00
Laurent Perron
17503ac111 Add BooleanValue on Sat/Python API (solver + callback) 2018-02-10 08:54:24 +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
12c8d9dbc0 change the LP relaxation in the sat/circuit constraint; change API to accept a sparse set of arcs instead of next variables 2018-01-17 13:11:14 +01:00
Laurent Perron
172404f718 fix cp_model.Solver 2017-12-06 11:31:56 +01:00
Laurent Perron
c363991e2b rearchitecture glop code 2017-12-05 16:45:10 +01:00
Laurent Perron
f9b6531f2b run_from_ipython -> RunFromIPython 2017-11-24 14:45:54 +01:00