Commit Graph

6243 Commits

Author SHA1 Message Date
Corentin Le Molgat
41376aadff Fix clean_dotnet for cp samples
- missing recipe for ortools/constraint_solver/samples/[bin,obj]
2019-01-10 09:58:12 +01:00
Corentin Le Molgat
f018cb9e2a Fixup VrpDropNodes.java 2019-01-09 17:27:43 +01:00
Corentin Le Molgat
5e441c3f2b Update tsp.cc & vrp.cc 2019-01-09 17:26:45 +01:00
Corentin Le Molgat
cd59b90650 Add .Net routing samples 2019-01-09 17:26:45 +01:00
Laurent Perron
0024336ce9 [CP-SAT] fix hinting and repeated solutions in optimization models 2019-01-09 14:55:16 +01:00
Laurent Perron
0815da7de5 fix log in parallel when sharing objective between workers 2019-01-09 13:38:00 +01:00
Laurent Perron
9587a79040 add Gomory cuts; off by default as it is not tuned enough 2019-01-09 11:50:39 +01:00
Corentin Le Molgat
38c03c4df6 Add Java samples 2019-01-09 11:30:30 +01:00
Laurent Perron
5827eadbcc speedup sat internals; fix bug with model with one trivially false XOr constraint 2019-01-09 11:25:49 +01:00
Laurent Perron
373b084881 Merge pull request #1010 from andersk/negated
python: Allow negated literals in LinearExpression
2019-01-09 08:12:31 +01:00
Anders Kaseorg
0dffe7f5c5 python: Allow negated literals in LinearExpression
Booleans are already considered integers with value 0 or 1, so it’s
natural to expect negated booleans to be considered integers with
value 1 or 0.

This makes it more convenient to define an antisymmetric array of
booleans: you no longer have to choose between not being able to use
greater[j, i] = greater[i, j].Not() in linear expressions and not
being able to use greater[j, i] = 1 - greater[i, j] in boolean
constraints.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-01-08 15:48:19 -08:00
Laurent Perron
0a35eadede fix display of solution in satisfiability models; fix rounding bugs in lp_utils 2019-01-08 15:58:58 +01:00
Laurent Perron
c0b4ac617c speed IntegerSumLe in CP-SAT 2019-01-07 18:04:31 +01:00
Corentin Le Molgat
3aafa3cda3 Update Vrp.cs 2019-01-07 17:23:21 +01:00
Corentin Le Molgat
64efcc13e3 Add VrpCapacity.java 2019-01-07 17:23:21 +01:00
Laurent Perron
295ffdbfcf small speedup in CP-SAT integer expressions 2019-01-07 15:41:24 +01:00
Laurent Perron
581bd2e751 Merge branch 'master' of github.com:google/or-tools 2019-01-07 14:27:27 +01:00
Laurent Perron
a765889b24 reorganize objective sharing and best bound reporting in CP-SAT (sequential and parallel; fix gtl cleanup 2019-01-07 14:27:21 +01:00
Corentin Le Molgat
82deee74d0 dotnet: update Tsp.cs 2019-01-07 13:36:19 +01:00
Laurent Perron
dcfb59bced fix pylint 2019-01-06 11:42:18 +01:00
Laurent Perron
6dbdc416f2 fix 2019-01-05 18:26:35 +01:00
Laurent Perron
028b364e9e improve workspace 2019-01-05 14:38:12 +01:00
Laurent Perron
02b6256988 add python paths 2019-01-05 14:30:53 +01:00
Laurent Perron
814a11fcf6 add vscode workspace 2019-01-05 14:27:39 +01:00
Laurent Perron
a27deb3468 fix 2019-01-05 12:34:50 +01:00
Laurent Perron
32b9f9aaa1 Merge branch 'master' of github.com:google/or-tools 2019-01-05 11:55:29 +01:00
Laurent Perron
1dd453aa80 change namespace for MakeCleanup 2019-01-05 11:55:18 +01:00
Laurent Perron
b52c15a58d update Makefile.gen.mk 2019-01-05 11:37:18 +01:00
Laurent Perron
b88a499b6c remove obsolete files from ortools/base; port code accordingly; add new sat sample 2019-01-05 11:30:35 +01:00
Laurent Perron
1c290f078a remove traces of callback.h 2019-01-05 08:52:41 +01:00
Laurent Perron
475b7932af remove obsolete spartsetable.h 2019-01-05 08:48:47 +01:00
Corentin Le Molgat
1b47822ff0 Simplify tsp.cc 2019-01-04 16:21:31 +01:00
Corentin Le Molgat
251317627a Update tsp.cc 2019-01-04 15:36:16 +01:00
Mizux
8ed6fb85c8 Update routing.md 2019-01-04 13:36:22 +01:00
Laurent Perron
b771a7a187 Merge branch 'master' of github.com:google/or-tools 2019-01-03 21:21:47 +01:00
Laurent Perron
e6b5b590c9 fix #1001 2019-01-03 21:21:33 +01:00
Corentin Le Molgat
39b14ecf6b dotnet: avoid race cond on project.json when building examples
- need to serialize example build located in the same directory...
2019-01-03 17:18:10 +01:00
Laurent Perron
64946d2083 fix for windows 2019-01-03 01:00:20 +01:00
Laurent Perron
b4c3e832a1 internal API 2019-01-02 20:19:25 +01:00
Laurent Perron
d5c49ee23a fix compilation 2019-01-02 17:38:04 +01:00
Laurent Perron
13149760e3 fix makefile 2019-01-02 17:31:53 +01:00
Laurent Perron
fd5631aba2 add cuts for CP-SAT 2019-01-02 17:30:26 +01:00
Laurent Perron
2a2d2d21bb fix cumulative presolve in CP-SAT 2019-01-02 17:01:23 +01:00
Laurent Perron
916e3136ec add new error type in status/canonical_errors; savings improvement in the routing library; scip_interface rewrite; first steps in CP-SAT cuts management 2019-01-02 16:35:40 +01:00
Corentin Le Molgat
e032b129e3 Protect space in path on windows 2019-01-02 13:53:27 +01:00
Corentin Le Molgat
a1f330e074 Fix compile with Python2.7
- list.copy() does not exist in 2.7+
2019-01-02 13:38:56 +01:00
Corentin Le Molgat
af29f63730 Fix dotnet build 2019-01-02 13:35:23 +01:00
Laurent Perron
4d0ec663e0 minor improvement 2018-12-30 23:08:34 +01:00
Laurent Perron
98abcc8595 simplify example 2018-12-30 22:54:56 +01:00
Laurent Perron
e68c3be1af use DP to generate valid slabs 2018-12-30 21:17:38 +01:00