Commit Graph

193 Commits

Author SHA1 Message Date
Laurent Perron
dbe177a0fb [CP-SAT] Support optional intervals in no_overlap_2d; add energetic cut to no_overlap_2d; disable cumulative relaxation of no_overlap_2d by default; fix #3012 2021-12-13 10:47:57 +01:00
Laurent Perron
6ae332569b natural API for Cp_SAT C++ 2021-12-09 15:29:49 +01:00
Laurent Perron
cfeb2e49d7 [CP-SAT] Reservoir constraint uses affine expression for the time part; rename fields in the reservoir constraint 2021-11-25 14:53:05 +01:00
Laurent Perron
50e38f1750 [CP-SAT] accept affine expressions as argument of AllDiff 2021-11-23 21:38:20 +01:00
Laurent Perron
5b1a99e330 [CP-SAT] allow double coefficients in the objective 2021-11-19 00:28:44 +01:00
Laurent Perron
b42582de27 [CP-SAT] better use of symmetries; better presolve of products; add affine API in the python API; fix linearization of products 2021-11-16 23:55:30 +01:00
Laurent Perron
9b75a7118d [CP-SAT] support numpy integers in most of the API 2021-11-15 11:48:17 +01:00
Laurent Perron
62088d593b [CP-SAT] polish code 2021-11-14 17:24:37 +01:00
Laurent Perron
3c591609bf [CP-SAT] change primal integral to gap integral; change arguments of product, division, modulo to be affine expression instead of variables 2021-11-13 08:38:21 +01:00
Laurent Perron
1eec259105 [CP-SAT] Cleanup intervals (remove start/size/end fields, remove _view from the other ones); change demands and capacity of the cumulative constraint to affine expressions; remove the experimental energies field from the cumulative constraint; first pass at detecting linear encoding of product of variab;es. This happens when both variables are encoded by the same literals, in an exactly_one relation; speed up the lb_tree_search worker 2021-10-20 19:50:09 +02:00
Laurent Perron
ab2aa5e74a improve doc 2021-10-19 14:42:34 +02:00
Laurent Perron
67cc8ed591 implements IntervalVar.{Start|Size|End}Expr in python 2021-10-16 14:45:24 +02:00
Laurent Perron
6167340f8e improve MIP->CP-SAT translator; mark old interval API as deprecated; improve presolve of affine relations 2021-10-07 17:34:53 +02:00
Laurent Perron
ef59381229 [CP-SAT] Enable linear expressions in AddMinEquality/AddAbsEquality/AddMaxEquality, and/or add AddLinMinEquality/AddLinMaxEquality; detect more encoding and remove variables only used in encodings 2021-10-05 17:20:38 +02:00
Laurent Perron
a188a66a9b [CP-SAT] fix presolve and postsolve corner cases 2021-09-22 14:57:59 +02:00
Laurent Perron
0fd236d316 bump doc 2021-09-21 10:55:35 +02:00
Laurent Perron
6a84a52d9e switch from pdoc3 to pdoc 2021-09-20 15:23:45 +02:00
Laurent Perron
3414942957 [CP-SAT] add parameter to control the size of the solution pool; improve expand of multiplications spanning across 0; fix scaling bug 2021-09-14 17:32:15 +02:00
Laurent Perron
08dbf8cb09 [CP-SAT] improve display of expr != constant 2021-09-14 12:16:58 +02:00
Laurent Perron
676462d79f Make BoundedLinearExpression more pedantic, fix #2762 2021-09-14 11:43:20 +02:00
Laurent Perron
43bbb6eae0 Merge pull request #2530 from stradivari96/master
[CP-SAT][Python] Use DeprecationWarning
2021-09-13 10:23:08 +02:00
Laurent Perron
8f5bfbc252 [CP-SAT] Fix performance bug on product/square cuts; polish new interval code 2021-09-10 15:11:11 +02:00
Laurent Perron
7e18238edb fix LinearExpressionProto in CP-SAT python 2021-09-08 23:01:36 +02:00
Laurent Perron
8aa13ac64a [CP-SAT] revamp interval APIs 2021-09-08 21:19:57 +02:00
Corentin Le Molgat
5688b39b7e python: Remove unneeded __future__
note: we only support Python3
2021-09-06 10:38:01 +02:00
Laurent Perron
703e313367 [CP-SAT] add more model simplification when building a python model 2021-08-26 14:02:53 +02:00
Laurent Perron
8bd69a4c8d reindent 2021-07-05 23:15:57 +02:00
Laurent Perron
1c2519dff5 add experimental energy info on the cumulative constraints; use it in cuts 2021-06-29 17:16:44 +02:00
Xiang Chen
338166b8d4 [CP-SAT][Python] Use DeprecationWarning 2021-05-07 00:13:55 +02:00
Laurent Perron
efd16c78da [CP-SAT] deprecate SearchAllSolutions and SolveWithSolutionCallback 2021-05-03 12:11:39 +02:00
Laurent Perron
f0c6c3b487 [CP-SAT] prepare for custom search; enable ExportToFile in binary format; add balas scheduling cut 2021-04-23 14:57:27 +02:00
Laurent Perron
c0d0cebfb4 fix incomplete propagation of diffn; rename cp-sat python test method 2021-04-14 18:45:31 +02:00
Laurent Perron
813a92f313 much more pedantic checks in python CP-SAT 2021-04-14 14:34:16 +02:00
Mizux Seiha
8bb54b04ef Bump Copyright to 2021
FYI:
find ortools \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/\(Copyright 2010\)-2018/\1-2021/g'
2021-04-01 21:00:53 +02:00
Laurent Perron
b93f3f4a2b fix #2454 2021-03-22 16:21:49 +01:00
Laurent Perron
dab31c5fe0 polish logs 2021-03-12 15:07:44 +01:00
Laurent Perron
968113be63 polish java/python/.net log from CP-SAT 2021-03-12 13:27:14 +01:00
Laurent Perron
4d1b9d227f capture CP-SAT log in python/java/.NET; visual tweak of the log; tweak the logging facilities for CP-SAT 2021-03-11 21:07:17 +01:00
Laurent Perron
5c11d9c0ba fixes 2021-02-17 18:38:59 +01:00
Laurent Perron
948476129c add support for model deep copy in C++ and python; increase the frequency of time limit checks in code solving 2021-02-17 16:42:54 +01:00
Laurent Perron
1d9174516f fix typos 2021-02-15 12:26:45 +01:00
Laurent Perron
ce52397ccf fix doc for assumptions new API 2021-02-05 17:18:58 +01:00
Xiang Chen
b34ceefb86 Wrap CP-SAT assumptions 2021-02-04 23:53:50 +01:00
Laurent Perron
8f458b3c38 add python ClearHints method to CpSolver 2021-02-04 18:14:43 +01:00
Xiang Chen
71c9abe73d [Python] Type Hint for CpSolver.ResponseProto 2021-02-04 14:22:53 +01:00
Laurent Perron
c80eec373b [CP-SAT] Change semantics/API of the reservoir constraint; added presolve on the reservoir constraint; experimental propagator for the reservoir constraint; fix #2293 2020-12-24 06:41:44 +01:00
Mizux Seiha
05f12990c9 remove iteritems() usage 2020-11-18 13:39:11 +01:00
Laurent Perron
bcb7b3073d large synchro with internal code: linear solver: introduce intermediate SCIP layer called gscip; sat: more work on slow propagation detection; base: remove statusor, use abseil version; constraint solver: more work on internal local search 2020-10-18 16:38:25 +02:00
Laurent Perron
a371180ea5 fix and unit tests for cp-sat export to file 2020-10-08 14:58:51 +02:00
Laurent Perron
d123dfadf6 add CpModel::ExportToFile for CP-SAT in all non C++ languages 2020-10-08 14:32:57 +02:00