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

65 Commits

Author SHA1 Message Date
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
Laurent Perron
e79811e9bb cleanup is_run_from_ipython() 2017-11-24 13:49:39 +01:00
Laurent Perron
0f83e0c3d3 defensive import of ortools/sat/python/visualization.py 2017-11-24 13:33:03 +01:00
Laurent Perron
7f43c6e206 use parameters in sat cp solve 2017-11-23 19:16:17 +01:00
Laurent Perron
89edd70833 add examples that captures code samples in the documentation 2017-11-23 15:25:53 +01:00
Laurent Perron
f84fe1b883 cp_model.AddSumConstraint(variables, lb, ub) 2017-11-23 11:28:47 +01:00
Laurent Perron
75109df0f2 split out cp sat objective code in its own file 2017-11-21 16:01:04 +01:00
Laurent Perron
21f9744862 modify python sat examples to use visualization when run from IPython; change corresponding notebooks 2017-11-21 03:54:06 +01:00
Laurent Perron
420e261f0c fix import 2017-11-17 12:17:44 +01:00
Laurent Perron
4f3bedfd34 experimental weighted circuit constraint for sat; improve sat internal for performance; add visualization library for IPython on sat/python 2017-11-17 11:27:29 +01:00
Laurent Perron
f3a9a1f2d6 fix python3 support in and out of protobufs 2017-11-17 00:19:34 +01:00
Laurent Perron
9e14920ad8 improve sat and sat/reservoir 2017-11-14 14:28:46 +01:00
Laurent Perron
4caed0fbdd hide classes from cp_model.py from the pydoc tool. 2017-11-14 13:51:03 +01:00
Laurent Perron
ae3007234b fix sat python reservoir code; continue working on rcpsp_sat.py to support consumer/producer problems 2017-11-13 15:45:02 +01:00
Laurent Perron
b06472bf44 small improvements in sat internals; add reservoir constraint to the cp_model {proto, python API) 2017-11-10 18:32:16 +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
722a436372 Check model has no objective when searching for all solutions 2017-11-05 10:40:19 +01:00
Laurent Perron
fd7e423201 Check model has no objective when searching for all solutions 2017-11-05 10:39:56 +01:00