Commit Graph

54 Commits

Author SHA1 Message Date
Corentin Le Molgat
63df4a72e9 python: Rework vector.i 2021-02-23 16:16:51 +01:00
Corentin Le Molgat
909004aa84 Export from Google 2021-02-22 15:06:21 +01:00
Mizux Seiha
d1b86cb16f python: Add support for vector<vector<primitive>> input 2021-02-19 16:02:51 +01:00
Corentin Le Molgat
241d79d698 routing: Export from Google to GitHub 2021-02-19 10:34:31 +01:00
Corentin Le Molgat
27e4fdb01d python: routing cleanup 2021-02-19 10:30:21 +01:00
Mizux Seiha
bf0807e1aa python: Update routing tests 2021-02-18 17:39:19 +01:00
Mizux Seiha
bdf5ed1663 python: Rename PairIntBool to IntBoolPair 2021-02-16 15:22:06 +01:00
Corentin Le Molgat
850968c9f1 routing: Rework Vector/Matrix transit management (#2315) 2021-02-16 13:43:52 +01:00
Corentin Le Molgat
c75ac92a5a Sync from Google to GitHub 2020-11-16 17:50:54 +01:00
Corentin Le Molgat
b7ae4a1581 Fix formatting 2020-11-03 20:26:47 +01:00
Laurent Perron
d2147306e2 reformat cp code; add bandit concatenate operator for the routing library; tweak var domination in cp-sat 2020-11-01 11:47:28 +01:00
Mizux Seiha
20d0496bfb reapply google format 2020-10-23 00:45:17 +02:00
Laurent Perron
bcb7b3073d large synchro with internal code: linear solver: introduce intermediate SCIP layer called gscip; sat: more work on slow propagation detection; base: remove statusor, use abseil version; constraint solver: more work on internal local search 2020-10-18 16:38:25 +02:00
Mizux Seiha
f087564d84 cpp: Format all files in ortools 2020-09-23 12:06:10 +02:00
Mizux Seiha
fa682b4907 remove deprecated examples using TreeMonitor 2020-09-19 18:04:50 +02:00
Mizux Seiha
d4d88e1f64 constraint_solver: Fix LocalSearchFilter samples 2020-08-14 14:07:58 +02:00
Mizux Seiha
90a3155af1 cmake(python): Fix module update 2020-05-20 18:46:57 +02:00
Mizux Seiha
775aec03dd cmake(python): Refactor
* Use new Python module
* Use setup.py.in input file (should fix windows error)
2020-05-20 10:13:14 +02:00
Corentin Le Molgat
0d6f6dddd9 Export g3 -> gh 2020-03-12 18:20:13 +01:00
Corentin Le Molgat
f2981e11c3 CMake:python: Add missing definition for swig 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
4c7456b175 CMake: Update Python support
* Add define SWIGWORDSIZE64 on Linux
* Add -doxygen option
* add ortools/util/python
* Move python generated stuff to BINARY_DIR/python
* Bump CMake >= 3.14 as requirement
  * SWIG module rework from 3.9 to 3.14
  * Python module rework in 3.12
* Drop Python 2.7 support (like in Makefile)
* Fix clean target
  * OUTPUT/BYPRODUCTS path are relative to CURRENT_BINARY_DIR not WORKING_DIR
* Fix ortools package install in virtualenv
* Clean target now remove the <build>/venv directory
2020-02-28 08:21:27 +01:00
Corentin Le Molgat
fd4ce1131c CMake: Update wrapper support 2020-02-14 11:12:44 +01:00
Corentin Le Molgat
e4358ee330 Expose GetStartIndex and GetEndIndex to Python
Follow #1843
2020-01-16 13:41:44 +01:00
Laurent Perron
2ff000ab9a bump abseil to the latest version, adapt the code all around 2019-11-20 14:28:11 -08:00
Laurent Perron
a39b544fde continue rearchitecture LS and routing 2019-08-09 11:53:20 -07:00
Laurent Perron
26d5fc7cb9 update routing/local search internal API 2019-08-06 15:54:57 -07:00
Laurent Perron
75fba177ea improve routing internals 2019-07-12 10:22:12 -07:00
Laurent Perron
b2656dbd94 add doxygen tags 2019-07-05 09:32:02 +02:00
Corentin Le Molgat
4a8346f084 Wrappers: Bind few RoutingIndexManager methods. 2019-04-19 18:47:55 +02:00
Laurent Perron
a33585e6aa mostly indent; internal improvements to the Routing library; change API with SearchLimit to RegularLimit 2019-04-11 09:46:06 -07:00
Laurent Perron
325ca6d78d fix checker bug in routing 2019-03-25 11:26:21 +01:00
Corentin Le Molgat
05a76b1f5f Update macro in constraint_solver.i 2019-03-21 17:14:09 +01:00
Corentin Le Molgat
1b3d24c0e6 Revert CONTAINERHELPER overwrite (Fix #1144)
- fix cvrptw_break.py
2019-03-21 13:22:53 +01: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
Corentin Le Molgat
2f0680127d Backport from g3 to github 2019-03-13 13:51:31 +01:00
Corentin Le Molgat
fc1a12e85a Export g3 to github 2019-02-18 15:44:06 +01:00
Corentin Le Molgat
719a2ba20a Python: Rework RoutingModel::*Index typemap (Fix #1030) 2019-01-31 14:57:17 +01:00
Corentin Le Molgat
f562e3a4ae Expose PickupAndDeliveryPolicy APIs (#961) 2019-01-17 14:56:50 +01:00
Corentin Le Molgat
6da44f8eaf Python: Fix AssignmentContainer<T, TElement> wrappers (Fix #967) 2018-12-17 14:23:52 +01:00
Laurent Perron
fedf3d4ff4 revamp and simplify swig support, force typed enums for C# and Java for all except the constraint_solver/routing module; port examples; Fix SAT on very large problems 2018-12-11 17:03:03 +01:00
Laurent Perron
589047ce90 python support int64 -> int64_t 2018-12-10 13:35:41 +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
Corentin Le Molgat
47fefdc3bb Remove tab from CMakeLists.txt
- Mandatory to follow google internal convention
2018-11-13 10:12:02 +01:00
Laurent Perron
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Corentin Le Molgat
8036f869dc CP: fix python swig for SearchParameters 2018-09-21 10:09:02 +02:00
Laurent Perron
e8d5858e67 revamp sat python solution callback, adds the ability to stop search from the solution callback. 2018-08-30 16:27:58 +02:00
Laurent Perron
701e7ab336 fix pyls_api.py crash on python 3 2018-08-30 07:28:59 +02:00
Corentin Le Molgat
19ae1c121c Fix python loader_path 2018-01-22 14:33:20 +01:00
Corentin Le Molgat
6856567eda Rework CMakeLists.txt
Dependencies:
- Add dependencies as subprojects instead of prebuild (aka imported target)
- add zlib project
- Use Cbc as CMake subproject instead of prebuilt
- Add log between each subproject
- Force gflags namespace to gflags

Or-tools:
- Rework python.cmake support
- Fix missing ortool.util in python (#558)
- Try to use static library for ortools::proto
pros: can use target_link_libraries to get includes etc...
cons: lot of symbols undefined since libortools.so will strip everything -_-
- Use add_library(XXX OBJECT) for ortools/*
- fix get version from git when using small depth copy
- Create Install rule for ortools
- Don't create export rules
note: since we use subprojects instead of Imported Target,
ortools export complained against target deps "that is not in the export set."

Update windows support
- add swig project
- Protobuf force the use of /MD instead of /MT
- or-tools use /MD by default
- Add missing ws2_32
- Add missing psapi
- Update windows disable warnings list
- Build Static or-tools on Windows
- fix windows export symbols leak issue

Signed-off-by: Corentin Le Molgat <corentinl@google.com>
2018-01-19 15:03:25 +01:00
Laurent Perron
10db4c7cd0 minor changes 2017-12-14 12:45:54 +01:00