Commit Graph

241 Commits

Author SHA1 Message Date
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
Laurent Perron
91f3b1dac3 add CpModel.HasObjective() 2017-11-05 10:39:02 +01:00
Laurent Perron
bdd72fe1b1 Add SearchForAllSolution in sat cp_model.py API; add code to export model from the steel_mill_slab_sat code 2017-11-05 10:31:52 +01:00
Laurent Perron
6cf95ec0e7 more work on steel_mill_slab_sat 2017-10-26 11:49:22 +02:00
Laurent Perron
c5d3788a3e solution observer in python/SAT 2017-10-25 14:20:21 +02:00
Laurent Perron
8076200a3a fix in makefiles 2017-10-23 13:02:46 +02:00
Laurent Perron
c40080b726 Add Implication to cp_model.py 2017-10-23 10:19:56 +02: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
5f6096d901 add more API on cp_model.py; gate_scheduling sat problem from or-tools.discuss 2017-10-17 14:15:44 +02:00
Laurent Perron
a54b49ebb8 change solution observer on sat to take a CpSolverResponse as parameter 2017-10-16 15:02:51 +02:00
Laurent Perron
e8540c1363 add vrp constraint to the sat solver; remove old no_cycle code 2017-10-16 11:20:54 +02:00
Laurent Perron
20ba8015bc fix sat bugs found by new examples; improve gitignore 2017-10-11 03:05:13 -07:00
Laurent Perron
48837ce11f Assignment -> Assignments in cp_model.py 2017-10-09 17:19:33 -07:00
Laurent Perron
394bbe232a move graph code around; improve internals of sat solver 2017-10-09 11:21:43 -07:00
Laurent Perron
9a5ea9f2de hard code int64 min/max in the python sat wrapper 2017-10-09 07:54:07 -07:00
Laurent Perron
8752053693 python sat files 2017-10-01 16:25:50 +02:00