Commit Graph

65 Commits

Author SHA1 Message Date
Laurent Perron
44edf167d9 minor reindent 2019-08-22 13:15:13 +02: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
feebdafe67 minor reindent 2019-07-15 10:24:42 -07:00
Laurent Perron
c34816e79d update knapsack solver doc 2019-07-12 10:02:29 -07:00
Laurent Perron
758af2b1f5 update knapsack_solver C++ doc 2019-07-11 17:46:00 -07:00
Laurent Perron
2ab87773a9 minor reindent 2019-07-10 09:38:45 -07:00
Laurent Perron
0c9b6d44d9 update csproj 2019-06-30 11:06:28 +02:00
Laurent Perron
bddfb623ac Update algorithms doc 2019-06-28 10:57:10 +02:00
piyo7
a4447076d2 incorporate all public methods of KnapsackSolver into Java wrapper 2019-06-12 21:28:25 +09:00
Laurent Perron
893a5e9969 Merge pull request #1325 from paultrow/patch-1
Add details to printed solution in knapsack.py
2019-06-05 07:56:36 +03:00
Paul
2a5e8fe7df Add details to printed solution in Knapsack.java (like those in knapsack.cc) 2019-06-04 15:50:28 -04:00
Paul
88bc342d0a Add details to printed solution in knapsack.py 2019-06-04 15:42:39 -04:00
Laurent Perron
fe22bf057a minor polish of examples 2019-05-28 15:28:01 +02:00
Corentin Le Molgat
f4dc003165 Remove empty lines in Knapsack.java 2019-05-14 11:18:15 +02:00
Corentin Le Molgat
d7a33542a2 Sync g3 -> github 2019-05-14 09:44:13 +02:00
Mizux Seiha
ccc9f950de Fix Knapsack.java 2019-05-11 00:52:00 +02:00
Corentin Le Molgat
4177135536 Add knapsack sample 2019-05-10 22:51:10 +02:00
Laurent Perron
a70ed70563 remove the need for IntArrayHelper.cs; support conversion from type[][] and type[,] to std::vector<std::vector<type>> in C# 2019-05-06 12:55:30 +02:00
Laurent Perron
c9b7d58e5a plenty of minor format issues; fix one numerical issue with glop; improve cut management in CP-SAT; automatic tightening of big-M in CP-SAT 2019-04-08 19:00:46 +02:00
Laurent Perron
2b9adc6255 sync indent, polish on SAT code; add RINS option for CP-SAT 2019-03-13 13:58:39 +01:00
Corentin Le Molgat
2f0680127d Backport from g3 to github 2019-03-13 13:51:31 +01:00
Daniel Ortiz
4941e038db Incorporate set_time_limit method. 2019-02-28 11:20:29 +01:00
Laurent Perron
a0d2853258 all libraries compiles under bazel 2019-02-10 18:51:36 +01:00
Laurent Perron
087868bcc2 maintenance on swig files; merge presolve context and expand context; minor fixes in the code 2019-02-05 15:06:47 +01:00
Corentin Le Molgat
7ee8a047bf Fix todo user name 2019-02-05 09:30:11 +01:00
Laurent Perron
d5c49ee23a fix compilation 2019-01-02 17:38:04 +01:00
Laurent Perron
fd5631aba2 add cuts for CP-SAT 2019-01-02 17:30:26 +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
a60c3291cd java support int64 -> int64_t 2018-12-10 13:35:51 +01:00
Laurent Perron
589047ce90 python support int64 -> int64_t 2018-12-10 13:35:41 +01:00
Laurent Perron
27f9c4f95e support int64_t transition in c# 2018-12-10 12:57:27 +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
0f7551551f Add Samples from g3 2018-11-27 08:20:58 +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
2debe09e43 CMake cleanup 2018-10-12 09:48:12 +02:00
Corentin Le Molgat
62cbe9a228 dotnet: Full Rework
- Create native project runtime.{rid}.Google.OrTools
  - follow the microsoft convention e.g.:
  https://www.nuget.org/packages/Microsoft.NETCore.App/
  https://www.nuget.org/packages/runtime.linux-x64.Microsoft.NETCore.App/
- Target `make_dotnet` targets local nupkg instead of dll.
- Use 4096 RSA key for or-tools.snk
- Clean nuget cache in `clean_dotnet` recipe

Refactor:
- Move cs files to ortools/*/csharp
- Move dotnet project to ortools/dotnet/Google.OrTools
- Move example generation to temp_dotnet
  - Avoid to mess the `BIN_DIR`
- Rework Google.OrTools.FSharp

Cleanup:
- Remove deps to netfx.props since we only support:
  netstandard2.0 TFM and netcoreapp2.1 Runtime TFM
- Remove OrTools.nuspec.in
  -> use newly added properties to .csproj format
- Remove of ortools/dotnet/OrTools project
  - replaced by ortools/dotnet/Google.OrTools
- Remove provided protobuf.dll.
  - Automatically retrieved from nuget.org

Misc:
- Add **/*.csproj to gitignore
- Add **/runtime.json to gitignore

- dotnet: Makefile windows fix
  - make.exe doesn't support `else ifeq`
2018-08-30 11:58:47 +02:00
Laurent Perron
4caaef3c23 deep sync with base library renaming; lint checking; Speedup sat; new crash procedure for glop 2018-08-28 11:19:49 +02:00
Laurent Perron
199dbee672 minor re-indents; typo fixes 2018-06-27 10:07:27 +02:00
Laurent Perron
92433a8e5d minor refactoring of the code, mostly reindent 2018-06-11 11:50:49 +02: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
5f95dc86fc allow assumptions with all search mode in SAT/CP 2018-03-23 15:22:38 +01:00
Laurent Perron
6b8cd2cdc2 finish C$ Sat Integer API; Refactor Glop code; Add new option for Glop Scaling; speed improvements in the sat solver 2018-02-16 17:08:01 +01:00
Laurent Perron
8ea92e372e remove glpk from knapsack_solver MIP options 2018-02-12 11:36:40 +01:00
Corentin Le Molgat
5759af1a97 Move CMake gflags target to its own namespace.
Use gflags::gflags as others deps to be more consistent and modern
2018-02-06 14:16:37 +01: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
88ef3d0302 remove std:: from std::min|max in comments; performance improvements on the SAT, bug fixes 2018-01-10 13:21:06 +01:00