Commit Graph

580 Commits

Author SHA1 Message Date
Driss Lahlou
d2f051f1b4 fix PYTHONPATH for tests and examples 2016-09-07 15:55:11 +02:00
dlahlou
8f080d4e68 Merge pull request #238 from mjfwest/mybranch
corrected use of local search operators.
2016-09-02 08:25:56 -07:00
Driss Lahlou
af3266907b fix todos 2016-08-31 16:25:00 +02:00
Martin West
457c0cacf4 corrected use of local search operators. 2016-08-29 01:22:40 +02:00
Adrian Rangel
3fc21ae08e don't use deprecated method 2016-08-25 23:27:23 -05:00
Vincent Furnon
799ae30ce8 Fix cvrptw_plot.py example: fix usage of variable indices. 2016-08-11 20:46:04 -04:00
Driss Lahlou
bd19bd4128 add a cvrptw.py example without plot 2016-07-29 13:53:30 +02:00
Laurent Perron
13e4a066a2 CP and Routing: Add local search profiling;
SAT: Change a bit API to simplify usage (e.g. SolveWithPresolve)
LP_DATA: continue simplification of templates in iterators
SAT: Regroup search utils is src/sat/util.h|cc
SAT: Add new eswa heuristics to sat solver
LINEAR_SOLVER: fix status reporting on SCIP
2016-07-28 10:15:46 -07:00
Laurent Perron
d625b21aed another failing flatzinc example 2016-07-25 12:44:31 -07:00
Laurent Perron
90ec506c80 segfaulting flatzinc example 2016-07-25 12:27:34 -07:00
Driss Lahlou
d133b15107 add log_search to RoutingSearchParameters 2016-07-20 15:49:09 +02:00
Laurent Perron
3e158e7656 sat based scheduling: no_cycle, disjunctive, precedences + 2 examples: jobshop_sat and weighted_tardiness_sat 2016-07-19 14:19:21 -07:00
Driss Lahlou
51f30a1cc6 update cvrptw.py : accessing to solver parameters 2016-07-18 18:13:10 +02:00
Laurent Perron
abf09891ad speed up table constraints; embed solver parameters in the routing parameters; fix a bug in RevIntSet 2016-07-13 14:51:35 -07:00
Laurent Perron
25e96b12d6 example of routing with disjoint time windows 2016-07-08 15:47:33 +02:00
Driss Lahlou
4505436ded fix cvrptw.py example 2016-07-05 13:17:16 +02:00
Laurent Perron
506a3a54b3 archives fixes for windows 2016-07-01 15:29:57 +00:00
Laurent Perron
fc063e85d3 smetp data files 2016-06-15 11:05:42 +02:00
Laurent Perron
721c79cdae smtwtp data files 2016-06-15 11:02:52 +02:00
Laurent Perron
bd5ca44653 fix cvrp java example 2016-06-13 11:40:43 +02:00
Laurent Perron
10c14caec7 improve cvrptw.py code 2016-06-13 11:31:55 +02:00
Laurent Perron
40f52674fc fix cvrptw.py 2016-06-13 11:29:54 +02:00
Laurent Perron
ad9a0f21bb fix acp_challenge 2016-06-08 14:07:51 +02:00
Laurent Perron
ce4fc37d1e fix examples 2016-06-08 14:01:57 +02:00
Laurent Perron
7ce87a955d change internal data structure in glop; remove all but 1 instance of filelinereader; change vehicle capacity in routing model from callback to array 2016-06-08 13:21:09 +02:00
Laurent Perron
259050f9e5 full support for visual studio 2015 2016-06-03 06:03:52 -07:00
Laurent Perron
95b14628f1 large rewrite in the documentation/headers; changed implementation of the ForbiddenInterval constraints, renamed to NotMember; remove unused mode in sat; rewrite of internals of glop; change callbacks to std::function in shortestpath.h; random sync with interval code 2016-06-02 13:19:10 +02:00
Laurent Perron
938372bc47 port cvrptw python example 2016-05-09 17:15:30 +02:00
Laurent Perron
fd1e4d4353 Issue173 in java 2016-04-14 13:23:00 +02:00
Laurent Perron
660e5f2844 issue173 example in C++ 2016-04-14 13:11:14 +02:00
Laurent Perron
6fe0922561 adapt to data being moved to examples 2016-04-12 18:04:18 +02:00
Laurent Perron
9a78298ab5 move files around 2016-04-12 17:41:05 +02:00
Laurent Perron
385b28c5fc Revert "unify include path for includes in examples/cpp for both source and binary installations"
This reverts commit 990bfce875.
2016-04-12 17:36:41 +02:00
Laurent Perron
990bfce875 unify include path for includes in examples/cpp for both source and binary installations 2016-04-12 15:27:25 +02:00
Laurent Perron
655c23fa46 remove duplicated data 2016-04-12 13:29:18 +02:00
Laurent Perron
c175e2c937 Merge branch 'master' of https://github.com/google/or-tools 2016-03-29 12:42:44 +02:00
hxd1011
c72ea5a950 Update knapsack_cp.py
The name of the solver (n_queens) is wrong and confusing. I changed it to knapsack_cp problem.
2016-03-28 09:55:02 -04:00
Laurent Perron
9232ee00e0 Merge branch 'master' of https://github.com/google/or-tools 2016-03-21 09:48:18 +01:00
Laurent Perron
c20fd0a8f5 misc sync with internal code 2016-03-21 09:48:13 +01:00
Laurent Perron
bed3fa9922 Use CBC by default instead of GLPK in python mip examples 2016-03-19 18:54:18 +01:00
Laurent Perron
a152cfae44 sync with internal code and fixes 2016-03-18 12:16:04 +01:00
Laurent Perron
a915c15b8e renaming in the Sat code; small cleaning in the SWIG code; improvements to the graph code to make it MT-safe 2016-03-12 06:32:56 -08:00
Laurent Perron
322396e358 new example 2016-03-09 13:45:43 -08:00
Laurent Perron
5d62ab0e2c small reindent 2016-02-09 15:45:18 +01:00
Laurent Perron
08ee0714ae minor sync with internal code 2016-02-09 12:07:21 +01:00
Laurent Perron
4b2888eb0a Merge branch 'master' of https://github.com/google/or-tools 2016-02-04 14:06:44 +01:00
Laurent Perron
98e68e6ad8 fix tsp.cc; add cp search monitor API from std::function; continue working on python natural API for LP/MIP 2016-02-04 14:06:30 +01:00
Laurent Perron
7a7d4cd8dd windows compilation fixes 2016-02-04 05:04:38 -08:00
lperron
f56499fa24 Merge pull request #153 from Shippr/overflowerror_fix
Cast to float and avoid divide-by-zero errors in cvrptw.py
2016-02-03 15:30:57 +01:00
Laurent Perron
bb6e091027 Switch parameters to proto3, propagate to all code, offer support in all languages 2016-02-03 15:15:58 +01:00