Commit Graph

87 Commits

Author SHA1 Message Date
Corentin Le Molgat
2d8c863c2a Sync g3 -> gh Part 3 2020-03-10 11:06:08 +01:00
Corentin Le Molgat
22356ff523 Sync g3 -> gh part_2 2020-03-09 18:34:21 +01:00
Corentin Le Molgat
b587d27a4a Sync g3 -> gh 2020-03-09 14:09:26 +01:00
Corentin Le Molgat
8fee57d205 CMake: dotnet rework
.Net: update runtime csproj.in
2020-03-05 15:18:21 +01:00
Corentin Le Molgat
5b6079a6e5 CMake:dotnet: Fix -FPIC management 2020-03-05 15:18:20 +01:00
Corentin Le Molgat
c59444b07e CMake:dotnet Add definition for swig 2020-03-05 15:18:20 +01:00
Corentin Le Molgat
f2981e11c3 CMake:python: Add missing definition for swig 2020-03-05 13:04:08 +01:00
Corentin Le Molgat
20c8ee05b8 CMake: fix dotnet_<targets> 2020-03-04 14:34:33 +01:00
Corentin Le Molgat
99516e690e CMake: Add dummy CMakeLists.txt in samples 2020-03-02 17:23:34 +01:00
Corentin Le Molgat
d67a1af2ea .Net: Fix SWIG compile option in CMake 2020-03-02 09:25:05 +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
349f6b7681 CMake: Update .Net support
* Add define SWIGWORDSIZE64 on Linux
* Add -doxygen option
2020-02-28 08:21:27 +01:00
Corentin Le Molgat
ed9136bb48 .Net swig refactor 2020-02-17 10:51:57 +01:00
Corentin Le Molgat
bbd00fcf52 Java: remove s/long long/long/ swig hack 2020-02-14 17:02:47 +01:00
Corentin Le Molgat
9ad19233cc dotnet: Bump all csproj 7.4 -> 7.5 2020-01-27 09:38:53 +01:00
Mizux Seiha
90c54ef30e Update .csproj of all samples
Allow to rollforward
2020-01-09 18:22:18 +01:00
Laurent Perron
63d985736e fix bazel 2019-12-16 13:32:27 +01:00
Laurent Perron
d2b505ab99 reindent 2019-12-16 12:33:54 +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
1730a2660a detect nans in hungarian 2019-10-21 16:49:32 +02:00
Laurent Perron
6a14013250 fix 2019-09-07 16:37:27 +02:00
Laurent Perron
8ffe6e6649 bump versions in .csproj 2019-09-07 16:20:27 +02:00
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