Commit Graph

180 Commits

Author SHA1 Message Date
Laurent Perron
7d65b79f95 shuffle code around to prepare sat API to be proto only/prefered 2017-07-26 15:23:29 -07:00
Laurent Perron
51d7f77c7c fix compilation of solve.cc 2017-07-20 11:35:38 -07:00
Laurent Perron
0501a62221 add sat clause simplifications to cp_model solver 2017-07-20 11:30:17 -07:00
Laurent Perron
dd0e9e200c fix example after removal of code in sat 2017-07-05 16:30:10 -07:00
Laurent Perron
8ecbea311b fix examples 2017-06-29 11:59:21 +02:00
Laurent Perron
5f23b5ff7c fix bazel build 2017-06-08 17:02:07 +02:00
Laurent Perron
6609fac882 AC all different in the SAT solver; change the way integer variables are encoded on top of boolean variables in the SAT solver; change protobuf utilities 2017-06-08 12:33:16 +02:00
Amit Prakash Ambasta
9d811b8ff7 Link examples shared libs against libortools for valid builds on OSx 2017-06-06 14:13:44 +05:30
Amit Prakash Ambasta
553772d03c Removed python build for cleaner patches 2017-05-31 12:00:50 +05:30
Amit Prakash Ambasta
72e3313784 Updated CMakeLists to retain hierarchy of proto generated files 2017-05-30 15:51:19 +05:30
Amit Prakash Ambasta
2a12468b93 Added cmake support for C++, initial python build support 2017-05-30 12:02:56 +05:30
Laurent Perron
8c08d72260 replace hash_map and hash_set by unordered_map and unordered_set 2017-04-27 17:34:24 +02:00
Laurent Perron
4db7d3bc4e remove hash_map/hash_set; replace with std::unordered_map|set 2017-04-27 14:14:05 +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
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
d7b510044f add more examples to examples/cpp/BUILD for bazel 2017-03-30 13:54:42 +02:00
Laurent Perron
90dcccf977 update the strawberry field example to use GLOP 2017-03-30 13:54:29 +02:00
Laurent Perron
2a88d5991f add bop to the solve example 2017-03-30 13:21:53 +02:00
Laurent Perron
3e4197b206 compile routing and tsp example in bazel 2017-03-30 11:50:10 +02:00
Laurent Perron
dd4fc5adcb cp examples 2017-03-29 23:24:29 +02:00
Laurent Perron
d02715ac15 rewrite build files to remove global targets; still missing the glop targets 2017-03-29 15:13:04 +02:00
Laurent Perron
395e170563 update examples after library changes 2017-03-28 16:13:30 +02:00
Laurent Perron
15bc5959cd revamp CP export model, swig it in c# + simple test 2017-03-24 14:10:29 -04:00
Laurent Perron
304e66ad5d add sat_runner binary to bazel 2017-03-22 06:33:49 -04:00
Laurent Perron
705fc3256c one linear solver example in bazel 2017-03-21 15:11:22 -04:00
Laurent Perron
8f691674ae first compiled example using bazel 2017-03-21 10:43:28 -04:00
Driss Lahlou
66db124c28 update the routing constructor in acp_challenge_routing.cc 2017-02-09 18:43:06 +01:00
Laurent Perron
b1f26f355e remove unrecognized line 2017-02-08 11:12:46 +01:00
Laurent Perron
c6345f269b support resource investment problems 2017-02-07 17:43:25 +01:00
Driss Lahlou
66b017de36 add cvrptw_with_breaks 2017-01-26 21:22:42 +01:00
Laurent Perron
ae08ac84aa continue work on rcpsp_sat and rcpsp_parser, better lower bounds in the routing lib; bug fixes in glop and bop 2017-01-18 10:50:37 +01:00
Laurent Perron
7fe2d9e107 improve sat solver; update rcpsp_sat, rcpsp_parser to read mode data formats; plenty of new rcpsp problems; small improvements to glop 2016-12-20 18:23:57 +01:00
Laurent Perron
ab4f7941f7 improve rcpsp_sat example; update the cvrptw to use breaks 2016-12-14 22:04:13 +01:00
Laurent Perron
c0a5987ff5 misc improvements in the code 2016-12-13 15:49:57 +01:00
Laurent Perron
9712afbb64 improve rcpsp_sat to support rcpsp_max 2016-12-13 15:49:42 +01:00
Laurent Perron
ea71f58ef2 minor sync with internal code 2016-12-09 14:15:01 +01:00
Laurent Perron
5030a8a213 add 2 new sat based examples: shift_minimization, and rcpsp; port old examples to new API 2016-12-08 14:59:14 +01:00
Driss Lahlou
bd0ecc2d06 edit multidim_knapsack to print assigned items + formatting the code 2016-11-16 18:20:16 +01:00
Driss Lahlou
a220b1b146 support Visual studio 2013 using Solver::IndexEvaluator2 2016-11-04 16:26:27 +01:00
Driss Lahlou
f6fe0043cb include base/hash.h in examples/cpp/fap_parser.h 2016-11-02 18:32:36 +01:00
Laurent Perron
592e4878ca Remove SetDepot on routing model; Add argument to RoutingModel ctor; port all examples (C++, python, java, C#; bump version number to 5.0 as we are breaking compatibility 2016-10-07 17:40:41 +02:00
Laurent Perron
18b97584c4 move proto_util 2016-10-07 17:29:07 +02:00
Laurent Perron
792c1358a5 Merge branch 'master' of https://github.com/google/or-tools 2016-10-05 14:15:20 +02:00
Laurent Perron
ef37320f7c port examples 2016-10-05 14:08:27 +02:00
Driss Lahlou
ba686e3f2f changes in running examples targets 2016-09-29 18:50:59 +02:00
Laurent Perron
9875d5c65a more work on sat/fz 2016-09-22 15:18:08 +02:00
Laurent Perron
cb98b1fa71 improve sat code; misc glop API 2016-09-12 13:42:16 +02:00
Driss Lahlou
af3266907b fix todos 2016-08-31 16:25:00 +02:00