Commit Graph

312 Commits

Author SHA1 Message Date
Laurent Perron
ce116160aa fix 2019-11-22 17:46:22 +01:00
Laurent Perron
60908cf671 sync examples 2019-11-22 15:17:10 +01:00
Laurent Perron
24e21cb7cf update examples 2019-08-06 15:57:08 -07:00
Laurent Perron
26d5fc7cb9 update routing/local search internal API 2019-08-06 15:54:57 -07:00
Manuel Ruiz
f50fc893a8 xpress integration in or-tools 2019-08-06 18:21:29 +02:00
Laurent Perron
5f9a56b8aa 7.2 -> 7.3 2019-08-05 09:39:01 -07:00
Laurent Perron
663f9c00de Init logging 2019-07-09 20:15:31 -07:00
Laurent Perron
7115cf570f reorganize SIGINT catching 2019-06-27 17:28:56 +02:00
Laurent Perron
fe22bf057a minor polish of examples 2019-05-28 15:28:01 +02:00
Laurent Perron
b78002be05 remove CP-SAT SolveWithModel, keep the equivalent SolveCpModel; optimize internal model 2019-05-15 20:19:00 +02:00
Laurent Perron
cd6bf20fe5 mostly reindent of examples 2019-05-06 10:31:03 +02:00
Laurent Perron
0ef6121de1 fix one more example 2019-04-18 19:24:37 +02:00
Laurent Perron
f7188c82b4 fix example 2019-04-18 19:20:39 +02:00
Corentin Le Molgat
a49b9143a4 Rework CMake dependencies management (Fix #1116)
- By default don't build dependencies simply call find_package()
- By default only build C++ library
- IF building Python, Java or .Net wrapper then force build dependencies
  - Build dependencies as STATIC
  - Build and Install (in CMAKE_BINARY_DIR) dependencies at configure time
2019-04-11 13:47:05 +02:00
Laurent Perron
752bcbfb93 default parameters for multi_knapsack_sat 2019-04-05 17:01:00 +02:00
Laurent Perron
e685805fc8 improve multi_knapsack_sat.cc 2019-04-05 16:43:23 +02:00
Laurent Perron
17b9b597a1 change CP-SAT C++ Api to call Build() on the model before solving; use log_search_progress parameters to display all log; enable this parameter in non C++ language; call InitGoogleLogging() automatically in non C++ languages 2019-04-05 14:58:33 +02:00
Laurent Perron
d1d1c01df4 add multi bin knapsack sat example 2019-04-04 23:07:06 +02:00
Laurent Perron
814935dab7 large routing update; rewrite PDP options; Fix examples of LS API after API change; minor sync on the rest of or-tools 2019-03-15 17:17:02 +01:00
stuarthillary
43a1eb5020 Fix check when computing all paths in https://github.com/google/or-tools/blob/master/examples/cpp/network_routing_sat.cc example 2019-03-12 15:20:49 +00:00
Laurent Perron
8257b081db examples compiles with bazel 2019-02-10 19:00:47 +01:00
Laurent Perron
6dbdc416f2 fix 2019-01-05 18:26:35 +01:00
Laurent Perron
a27deb3468 fix 2019-01-05 12:34:50 +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
Corentin Le Molgat
affbc1e0c0 Fix CMake test list 2018-12-28 17:09:08 +01:00
Corentin Le Molgat
ea8d8195da Fix CMake compilation
- tsp.cc and vrp.cc have move to ortools/cp/samples
2018-12-28 16:00:40 +01:00
Corentin Le Molgat
58b8386e96 Move tsp.cc & vrp.cc to cp/samples 2018-12-27 11:02:35 +01:00
Laurent Perron
1d04b1738d move routing code around; cleanup examples 2018-12-18 15:45:34 +01:00
Laurent Perron
37776ddc6f cleanup routing API and examples on transits 2018-12-17 09:10:37 +01:00
Laurent Perron
a510e8e19b tentative variable bound sharing between threads 2018-12-16 23:18:40 +01:00
Laurent Perron
39f30fb178 revert last change on the routing API; report new best bound of the SAT solver in the log 2018-12-14 14:25:52 +01:00
Laurent Perron
2861b24ddb change routing disjunction API to use list of int instead of int64 for nodes 2018-12-12 11:02:24 +01:00
Laurent Perron
c36ac046f7 prepare c++ code for int64 = int64_t 2018-12-07 19:43:46 +01:00
Laurent Perron
8b6da37ed5 revert last commit 2018-12-01 16:06:18 +01:00
Laurent Perron
7ca7fc393a remove template specialization in min/max after int64 revamp 2018-12-01 15:20:35 +01:00
Laurent Perron
0b034b6e30 fix cmakefile 2018-11-30 14:48:55 +01:00
Laurent Perron
798b9e73e2 fix the rest of the C++ examples 2018-11-30 14:48:55 +01:00
Laurent Perron
fe0249dd64 fix cvrptw_lib.h 2018-11-30 14:48:55 +01:00
Laurent Perron
f2573d33b1 Fix merge abseil - v6.10 2018-11-30 14:48:55 +01:00
Corentin Le Molgat
b027e57e95 dotnet: Remove reference to dotnet release command
- Currently not implemented...

Add abseil patch

- Add patches/absl-config.cmake

Makefile: Add abseil-cpp on unix

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

Makefile: Add abseil-cpp on windows

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

CMake: Add abseil-cpp

- Force abseil-cpp SHA1 to 45221cc
  note: Just before the PR #136 which break all CMake

port to absl: C++ Part

- Fix warning with the use of ABSL_MUST_USE_RESULT
  > The macro must appear as the very first part of a function
    declaration or definition:
    ...
    Note: past advice was to place the macro after the argument list.
  src: dependencies/sources/abseil-cpp-master/absl/base/attributes.h:418
- Rename enum after windows clash
- Remove non compact table constraints
- Change index type from int64 to int in routing library
- Fix file_nonport compilation on windows
- Fix another naming conflict with windows (NO_ERROR is a macro)
- Cleanup hash containers; work on sat internals
- Add optional_boolean sub-proto

Sync cpp examples with internal code
- reenable issue173 after reducing number of loops

port to absl: Python Part

- Add back cp_model.INT32_MIN|MAX for examples

Update Python examples

- Add random_tsp.py
- Run words_square example
- Run magic_square in python tests

port to absl: Java Part

- Fix compilation of the new routing parameters in java
- Protect some code from SWIG parsing

Update Java Examples

port to absl: .Net Part

Update .Net examples

work on sat internals; Add C++ CP-SAT CpModelBuilder API; update sample code and recipes to use the new API; sync with internal code

Remove VS 2015 in Appveyor-CI

- abseil-cpp does not support VS 2015...

improve tables

upgrade C++ sat examples to use the new API; work on sat internals

update license dates

rewrite jobshop_ft06_distance.py to use the CP-SAT solver

rename last example

revert last commit

more work on SAT internals

fix
2018-11-30 14:48:55 +01:00
Laurent Perron
9991c88819 fix 2018-11-26 11:03:04 +01:00
Laurent Perron
4afccdb52c network routing -> network_routing_sat 2018-11-25 11:10:12 +01:00
Laurent Perron
46a78c021d golomb -> golomb_sat 2018-11-24 23:06:05 +01:00
Laurent Perron
dbbcc15359 reimplement costas_array with the CP-SAT solver. 2018-11-24 19:34:08 +01:00
Laurent Perron
8581d2a552 add support for parameters 2018-11-24 16:01:12 +01:00
Corentin Le Molgat
4ae6e1fea1 Fix examples/cpp/CMakeLists.txt 2018-11-23 15:51:38 +01:00
Laurent Perron
4c661f07ae remove jobshop_earlytardy; add support for earliness in jobshop_sat; improve jobshop_scheduling_parser to support jet file (Jobshop Early Tardy) 2018-11-23 15:25:12 +01:00
Corentin Le Molgat
b6f0705a3d Fixup CMakeLists.txt 2018-11-23 11:10:54 +01:00
Corentin Le Molgat
5e78dc2a5e Fixup examples/cpp/CMakeLists.txt 2018-11-23 10:51:12 +01:00