Commit Graph

9190 Commits

Author SHA1 Message Date
Mizux Seiha
cacbbd6c11 Rename stigler.py to stigler_contrib.py 2021-08-04 15:17:41 +02:00
Laurent Perron
a48fba3205 Merge branch 'master' of github.com:google/or-tools 2021-07-31 00:01:08 +02:00
Laurent Perron
f959269d77 fix #2707 2021-07-31 00:00:36 +02:00
Mizux Seiha
417b5fe13c Fix cmake/host.CMakeLists.txt 2021-07-29 23:31:23 +02:00
Mizux Seiha
e71d0df2f4 ci: Fix CMake ubuntu non interactive issue 2021-07-29 23:30:46 +02:00
Laurent Perron
4691c6557f Merge branch 'master' of github.com:google/or-tools 2021-07-29 22:02:05 +02:00
Laurent Perron
9be2c1aaa9 [CP-SAT] fix bug in presolve; add specialized relaxation and cuts for max affine constraint 2021-07-29 22:01:55 +02:00
Mizux Seiha
8e91f6e8a3 make: Fix scip LICENCE install 2021-07-27 11:10:29 +02:00
Mizux Seiha
06b8ce3c06 bazel: update scip 2021-07-27 01:54:28 +02:00
Mizux Seiha
2a53818e43 cmake: Fetch SCIP from GitHub master 2021-07-26 18:43:51 +02:00
Mizux Seiha
373d0b8a5d make: Fetch SCIP from GitHub master 2021-07-26 18:43:45 +02:00
Corentin Le Molgat
013bb65405 Fix dotnet samples 2021-07-26 12:47:10 +02:00
Mizux Seiha
38ec558aaa Rework fsproj.in
* fix snk path in fsproj
2021-07-26 12:46:56 +02:00
Corentin Le Molgat
8ee6128bee dotnet: Fix makefile 2021-07-26 12:45:24 +02:00
Corentin Le Molgat
0c8606e768 Add new csproj.in 2021-07-26 12:45:12 +02:00
Corentin Le Molgat
69d59fc032 remove previous csproj.in 2021-07-26 12:45:12 +02:00
Mizux Seiha
8fcb87faa5 cmake: cleanup dotnet.cmake 2021-07-26 12:45:12 +02:00
Corentin Le Molgat
6a92c0fecb Directory.Build.props.in copyright update 2021-07-26 12:45:11 +02:00
Mizux Seiha
87e1673c0e cmake: dotnet csproj.in update 2021-07-26 12:45:11 +02:00
Laurent Perron
4f64680acb Merge branch 'master' of github.com:google/or-tools 2021-07-23 21:59:46 +02:00
Laurent Perron
53501ece81 add ctor to affine relations 2021-07-23 21:59:41 +02:00
Laurent Perron
80987d328b [CP-SAT] rewrite element expand; improve lin_max linear relaxation; detect value element and add linear relaxation; plenty of bug fixes 2021-07-23 21:59:20 +02:00
Laurent Perron
3793d0f7f3 add optional logger to SatSolveProto 2021-07-23 21:55:18 +02:00
Laurent Perron
790c947453 remove forced slacks in glop 2021-07-23 21:54:59 +02:00
jjacobsohn
836b522235 updates for pull request per review by @Mizux 2021-07-23 11:59:38 +02:00
jjacobsohn
5418a566c6 provide example cmake commands for full build 2021-07-23 11:59:38 +02:00
jjacobsohn
1199171dbb eliminate spurious diffs after cmake 2021-07-23 11:59:38 +02:00
Laurent Perron
78a7be8d6a improve default scheduling search 2021-07-16 15:34:40 +02:00
Laurent Perron
b72cea866b fix #2649; fix #2571 2021-07-16 15:34:23 +02:00
Laurent Perron
8dc58d423b fix typo 2021-07-16 15:33:02 +02:00
Laurent Perron
17ea6efa50 bump gscip code 2021-07-15 18:38:39 +02:00
Laurent Perron
b0c79d4d4b improve scheduling heuristics 2021-07-15 18:38:26 +02:00
Laurent Perron
02c1a98d34 fix #2661 v2 2021-07-15 18:11:08 +02:00
Laurent Perron
0896548a8e improve jobshop_sat: fix bug in transitions; remove search heuristics as default is better 2021-07-15 15:36:11 +02:00
Laurent Perron
e877fdde7b improve presolve; fix #2661 2021-07-15 11:14:45 +02:00
Laurent Perron
0f65844f2f new scheduling heuristics 2021-07-15 11:14:27 +02:00
Laurent Perron
62ed1bb34b new fp functions 2021-07-15 11:13:11 +02:00
Laurent Perron
700847b3ff fix #2656 2021-07-13 13:47:57 +02:00
Laurent Perron
2287ed2b58 fix #2604 2021-07-12 15:57:34 +02:00
Laurent Perron
bf253b1418 Merge pull request #2631 from ascherkus/master
fix logging timestamps
2021-07-06 23:06:37 +02:00
Andrew Scherkus
06010a46b6 fix logging timestamps
The old code was incorrectly casting a double milliseconds value to
the integer seconds time_t type, which caused incorrect month/day and
timestamp values in log output.

Instead use absl::ToTimespec() to access the tv_sec and tv_nsec values
directly.
2021-07-06 13:16:53 -04:00
Mizux
f5ffe9af50 Update Vagrantfile 2021-07-06 09:17:35 +02:00
Laurent Perron
8bd69a4c8d reindent 2021-07-05 23:15:57 +02:00
Laurent Perron
afcb9e2ae5 Merge branch 'master' of github.com:google/or-tools 2021-07-05 19:10:59 +02:00
Laurent Perron
fb2ef5fc1a remove duplicate variables in table presolve 2021-07-05 19:10:50 +02:00
Laurent Perron
8a51a9a61b more info on model stats 2021-07-05 19:10:27 +02:00
Mizux Seiha
1757c35e12 SCIP: fix comment 2021-07-05 09:20:13 +02:00
Mizux Seiha
7c7c3fa582 cmake: find format 2021-07-05 09:20:13 +02:00
Laurent Perron
6530df1369 [CP-SAT] replace variable fully encoded only used in the objective by the weighted sum of its literals 2021-07-02 14:21:13 +02:00
Laurent Perron
5879441a97 [CP-SAT] add quadratic term to the linear constraint builder 2021-07-01 17:44:12 +02:00