Commit Graph

4201 Commits

Author SHA1 Message Date
Laurent Perron
4db7d3bc4e remove hash_map/hash_set; replace with std::unordered_map|set 2017-04-27 14:14:05 +02:00
Laurent Perron
bb865b6667 Merge branch 'master' of https://github.com/google/or-tools 2017-04-27 13:13:54 +02:00
Laurent Perron
8298905887 fix 2017-04-27 13:13:52 +02:00
Laurent Perron
ad6518ea8b more compilation fixes 2017-04-27 09:35:32 +02:00
Laurent Perron
86061d9488 remove unused code 2017-04-27 09:31:27 +02:00
Laurent Perron
5d3b3ab7c2 fix sat_cnf_reader 2017-04-27 09:31:10 +02:00
Laurent Perron
9f6e447d00 fix bazel build 2017-04-27 09:06:18 +02:00
Laurent Perron
84e8058255 single workspace architecture for bazel after include earthquake 2017-04-26 22:30:32 +02:00
Laurent Perron
2e93ff5b7d missing file 2017-04-26 17:57:49 +02:00
Laurent Perron
66b8d23079 move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files 2017-04-26 17:30:25 +02:00
Laurent Perron
a50732924c move file in correct place 2017-04-24 13:00:26 +02:00
Laurent Perron
c5c710162e fix make archive 2017-04-21 16:41:23 +02:00
Laurent Perron
a32c381921 fix vs2013 issue 2017-04-21 11:39:28 +02:00
Laurent Perron
6921119f6e fix path to glpk build 2017-04-20 18:24:00 +02:00
Laurent Perron
6bdd83d481 Merge branch 'master' of https://github.com/google/or-tools 2017-04-20 18:22:38 +02:00
Laurent Perron
fce895d29e move glpk.BUILD to bazel 2017-04-20 14:21:27 +02:00
lperron
aef48da3a0 Merge pull request #368 from legrosbuffle/master
Bazel: Add optional support for GLPK.
2017-04-20 14:17:06 +02:00
Laurent Perron
06c3f97e8e missing BUILD file 2017-04-20 14:08:47 +02:00
Clement Courbet
6fa561cffb Merge branch 'master' into master 2017-04-20 14:07:59 +02:00
Clement Courbet
cceb028cde bump glpk to 4.52 2017-04-20 14:06:20 +02:00
Laurent Perron
4171c41fc0 regroup bazel files 2017-04-20 13:43:01 +02:00
lperron
c5beed496c Merge pull request #347 from indiemoney/isnan
Use std::isnan
2017-04-20 10:03:28 +02:00
Laurent Perron
b3e7e1edab fix make third_party on windows after gflags update 2017-04-20 00:06:17 +02:00
Laurent Perron
f7147d6dce Merge branch 'master' of https://github.com/google/or-tools 2017-04-19 21:01:50 +02:00
Laurent Perron
1f9d096e9d cleanup java flags in makefiles 2017-04-19 21:01:24 +02:00
Laurent Perron
b43447dde9 bump gflags to 2.2.0 2017-04-19 16:51:45 +02:00
Laurent Perron
ea0364dc57 Merge branch 'master' of https://github.com/google/or-tools 2017-04-19 16:22:13 +02:00
Laurent Perron
7254b51483 cosmetic improvements to the code 2017-04-19 16:20:56 +02:00
Laurent Perron
ef2c3e5d2a Merge branch 'master' of https://github.com/google/or-tools 2017-04-18 15:24:48 +02:00
Laurent Perron
ad753d7c71 fix warning 2017-04-18 15:24:44 +02:00
Clement Courbet
53c41b2ad6 Bazel: Add optional support for GLPK.
Try it out:
bazel run --define USE_GLPK= cpp:linear_programming
2017-04-18 14:12:08 +02:00
Laurent Perron
787d8075c2 various compilation fixed for visual studio 2013 2017-04-18 00:08:19 +02:00
Laurent Perron
be1b75a8f6 fix makefiles for visual studio 2013 64 bit; bump protobuf to 3.2.0 2017-04-18 00:01:27 +02:00
Laurent Perron
c4c52c687b fix windows warning 2017-04-17 21:19:36 +02:00
Laurent Perron
c9b8b7b3e6 Fix routing deps 2017-04-09 21:56:47 +02:00
Laurent Perron
5fbd9173a3 Merge branch 'master' of https://github.com/google/or-tools 2017-04-09 21:42:44 +02:00
Laurent Perron
c40247b9ec add NumXXX on CpModelLoader 2017-04-09 21:42:09 +02:00
Laurent Perron
ef825804b5 fix compilation on visual studio 2013 2017-04-09 21:40:29 +02:00
Laurent Perron
e1062a7a3b remove warning 2017-04-09 21:40:14 +02:00
Laurent Perron
3736072d20 speed up timetabling in sat 2017-04-07 13:50:29 +02:00
Laurent Perron
b9e9031b9b fix memory leak 2017-04-07 13:50:12 +02:00
Laurent Perron
0314b93db3 improve glop internals 2017-04-06 14:10:53 +02:00
Laurent Perron
4c55045c88 improve sat scheduling 2017-04-06 14:10:20 +02:00
Laurent Perron
804d9fea60 add eof line 2017-04-06 14:10:02 +02:00
Laurent Perron
e8d696a8d9 remove spurious line 2017-04-06 14:09:37 +02:00
Laurent Perron
e723fc15a7 switch windows scip support to use precompiled libraries 2017-03-31 09:26:33 +00:00
Laurent Perron
41bbf9fdf9 remove support for sulum; bump scip_interface code to support 4.0; change the way we interact with scip at compile time 2017-03-31 10:49:27 +02:00
Laurent Perron
b90edee99a Merge branch 'master' of https://github.com/google/or-tools 2017-03-31 09:59:30 +02:00
Laurent Perron
2e86d9ac83 bazel build file for flatzinc 2017-03-31 09:58:45 +02:00
Laurent Perron
2cf3850457 remove dependency on flex/bison; store golden parser file in github 2017-03-31 09:58:07 +02:00