Commit Graph

52 Commits

Author SHA1 Message Date
Corentin Le Molgat
ba9df47b38 constraint_solver: rework zlib support 2025-10-16 11:50:53 +02:00
Corentin Le Molgat
a7f49a2585 backport from main
* rename swig files .i in .swig
* update constraint_solver and routing
* backport math_opt changes
* move dynamic loading to ortools/third_party_solvers
2025-07-23 23:12:34 +02:00
Guillaume Chatelet
46f73b3d35 Backport trivial changes 2025-07-18 16:43:00 +02:00
Corentin Le Molgat
a66a6daac7 Bump Copyright to 2025 2025-01-10 11:35:44 +01:00
Corentin Le Molgat
6de3f59af2 constraint_solver: Backport routing update from main 2024-11-18 17:01:27 +01:00
Corentin Le Molgat
d0f6fcc7fd constraint_solver: rework java wrapper to support absl::string_view 2024-01-10 14:23:02 +01:00
Corentin Le Molgat
4d1e60d531 java: Fix string_view wrap in PropagationBaseObject::set_name
note: in python the method is ignored
note2: our bazel do not constraint solver in java
2024-01-08 18:03:08 +01:00
Corentin Le Molgat
bda5b4e632 constraint_solver: Export from google3
* Add an Iterated Local Search (ILS) approach.
* Replace some std::string by absl::string_view
* Add RoutingResourceClassIndex
2024-01-08 18:03:08 +01:00
Mizux Seiha
a76bf1c5dd bump license boilerplate 2024-01-04 13:43:15 +01:00
Corentin Le Molgat
847cfc9b93 constraint_solver: export from google3 2023-12-01 18:25:54 +01:00
Laurent Perron
cdd5de3e60 absl::string_view 2023-11-09 13:46:25 +01:00
Corentin Le Molgat
c60a2d03d6 constraint_solver: export from google3 2023-10-04 15:58:45 +02:00
Corentin Le Molgat
d46ebfeabf integral_types.h to types.h 2023-08-18 16:14:58 +02:00
Corentin Le Molgat
99eba7797b constraint_solver: format 2023-07-05 13:10:41 +02:00
Corentin Le Molgat
2a7f8724bd windows: Fix function declaration (fix #3807) 2023-06-05 15:17:10 +02:00
Corentin Le Molgat
f25897b566 constraint_solver: sync with google3 2023-06-02 08:53:08 +02:00
Corentin Le Molgat
bda9c2f34a constraint_solver: Export from google3 2022-12-07 17:38:03 +01:00
Corentin Le Molgat
656a5bb244 google3: export routing 2022-09-19 15:41:11 +02:00
Corentin Le Molgat
f98afa8e42 Add missing STL include 2022-07-22 16:25:40 +02:00
Mizux Seiha
ebf0581841 Sync from google3 2022-06-22 08:28:59 +02:00
Corentin Le Molgat
c7120439d4 Bump license date 2022-06-17 14:23:23 +02:00
Corentin Le Molgat
06bc318331 constraint_solver: sync with google3 2022-05-20 18:05:14 +02:00
Corentin Le Molgat
03de36e782 cpp: Fix system headers 2022-05-19 17:23:01 +02:00
Mizux Seiha
de9aca5770 fix non c++20 code
see: https://eel.is/c++draft/diff.cpp17.class#2
2022-02-24 16:20:36 +01:00
Laurent Perron
d54ed8f29e [ROUTING] remove old gtl:: obsolete code; fix overflow error 2021-12-05 12:15:27 +01:00
Mizux Seiha
8bb54b04ef Bump Copyright to 2021
FYI:
find ortools \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/\(Copyright 2010\)-2018/\1-2021/g'
2021-04-01 21:00:53 +02:00
Corentin Le Molgat
a40143cdd2 cpp: Migrate int64 to int64_t 2021-04-01 20:20:43 +02:00
Laurent Perron
3ea59976a7 simplify int64/uint64 constant and casts 2021-02-07 00:45: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
Corentin Le Molgat
e4caaf96bc format file forcing the left alignment 2020-10-29 14:25:39 +01:00
Laurent Perron
f1bb445810 first version without gflags and glog
* Add custom glog using absl::flags
* Fix lpi_glop patch to use absl::flags

Abseil:
* remove gflags and glog deps

Make:
* remove gflags and glog deps (unix & windows)
* regenerate makefile.gen.mk
* Cleanup install recipe
* Cleanup archive
* Cleanup doc
2020-10-24 00:49:50 +02:00
Mizux Seiha
20d0496bfb reapply google format 2020-10-23 00:45:17 +02:00
Laurent Perron
a4258f2bdf switch flags setters and getters to the absl format 2020-10-21 00:21:54 +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
Corentin Le Molgat
72d753afea constraint_solver: Export from g3 to gh
* replace LocalSearchFilter array by LocalSearchFilterManager.
* Use of absl:Duration type to manage duration.
  note: previously was a int64 in ms.

* Add vehicle type feature.
* Add RoutingModel::GetRoutesFromAssignment().
* Add soft span quadratic coefficient cost.
* Add missing container_logging.h
* Use of constexpr.
* Replace LL cast by proper int64.
* Few performance improvement.
* Deep rework of break implementation.
2020-08-14 14:07:58 +02:00
Laurent Perron
34231dbbc3 update routing code 2019-12-05 18:10:18 +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
639a4a8c9c improve routing library 2019-04-16 09:25:06 -07: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
b49e6433c6 use absl::Duration in routing search 2019-04-01 11:36:53 +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
Laurent Perron
ee3520a5a1 remove GG_LL_FORMAT from code; reorganize SAT-LP connection; fix bug in routing library 2018-12-03 14:26:31 +01:00
Laurent Perron
ddf487e759 Revert "revamp integral type, fix int64 to be int64_t; remove GG_LL_FORMAT macros"
This reverts commit 123280f98e.
2018-12-01 16:06:21 +01:00
Laurent Perron
123280f98e revamp integral type, fix int64 to be int64_t; remove GG_LL_FORMAT macros 2018-12-01 15:07:47 +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
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Laurent Perron
70e73d8754 clang-format 2018-06-08 16:40:43 +02:00
Laurent Perron
8623fc3580 speed up sat cumulative; add namespaces to base library + fix code 2018-04-11 13:00:30 +02:00
Laurent Perron
8d7320b962 deep sync with base library; prepare for abseil.io integration 2017-12-08 14:52:49 +01:00
Laurent Perron
2c7a8bf8f6 change copyright date 2017-10-17 13:08:10 +02:00