Commit Graph

56 Commits

Author SHA1 Message Date
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
20c8ee05b8 CMake: fix dotnet_<targets> 2020-03-04 14:34:33 +01:00
Corentin Le Molgat
d7b67ee2eb CMake: fix constraint_solver dotnet swig 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
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
061f5da1f2 .Net: Ignore broken methods (Fix #1276)
Usually no typemap available for return type or arguments
2020-01-17 11:22:29 +01:00
Corentin Le Molgat
089e4ebfa1 Expose GetStartIndex and GetEndIndex to .Net
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
0805c35356 fix 2019-07-22 15:05:30 -07:00
Corentin Le Molgat
6cc1df06d7 Sync g3->github 2019-05-13 16:51:33 +02:00
Corentin Le Molgat
d8ca1d48d3 .Net: Fix IntTupleSet.cs 2019-05-07 11:30:43 +02:00
Laurent Perron
70574490ba more cleanup in routing/CP C# 2019-05-06 13:20:58 +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
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
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
afa5e15156 .Net: Rework routing.i
- Add missing DEFINE_INDEX_TYPE_TYPEDEF()
2019-03-07 17:44:09 +01:00
Corentin Le Molgat
1e398fabad .Net: routing_type.i cleanup 2019-03-07 17:44:09 +01:00
Corentin Le Molgat
90249a37cb .Net: Rework constraint_solver.i
- Add support for more std::function<>
- Remove all remaining SWIGTYPE_p
- comment out code in IntArrayHelper.cs
2019-03-07 17:44:09 +01:00
Corentin Le Molgat
b92d396fd7 .Net: Add support for long[][] -> CpInt64VectorVector 2019-03-04 11:25:21 +01:00
Corentin Le Molgat
a1b9437714 dotnet: ugly fixup
TODO(mizux)
- Solver::MakeIntVar(), solver should keep IntVar alive !
- Solver::MakeMinimize(), solver should keep objective var alive !
- Solver::MakeSearchlog(), searchlog should keep solver alive !
2019-02-20 15:17:15 +01:00
Corentin Le Molgat
fc1a12e85a Export g3 to github 2019-02-18 15:44:06 +01:00
Corentin Le Molgat
807ce59344 Fixup Java constraint solver. 2019-02-12 11:06:27 +01:00
Corentin Le Molgat
d054c53c74 Java: Use lambda in Constraint Solver 2019-02-12 11:06:27 +01:00
Laurent Perron
9aed182dcf add comments, reindent 2019-02-11 13:12:04 +01:00
Corentin Le Molgat
483dacbc28 Java: Routing [Unary]Transit callback use @FunctionalInterface
- fix the java WeakGlobalRef leak...
- Now samples use lambda when possible for transit callback
  - keep class in Tsp.java to see how it works
2019-02-05 12:05:57 +01:00
Corentin Le Molgat
fddd1b9a8d dotnet: Add delegate support for display_callback
- Add Xunit Tests to check DisplayCallback delegates are working.
2019-01-30 14:29:50 +01:00
Corentin Le Molgat
ec4a7d6e0d Rework C# Callback to use delegates 2019-01-30 14:29:50 +01:00
Corentin Le Molgat
f562e3a4ae Expose PickupAndDeliveryPolicy APIs (#961) 2019-01-17 14:56:50 +01:00
Corentin Le Molgat
263ab653b4 csharp: rename RoutingModel::status() to GetStatus().
- to avoid conflict with enum RoutingModel::Status since methods
need to be in UpperCamelCase in .Net
2019-01-17 13:13:32 +01:00
Corentin Le Molgat
fbc6f4c4da Java/.NET: prefix AssignmentContainer template typedef by Assignment 2019-01-16 13:46:32 +01:00
Corentin Le Molgat
54e38c692a .Net: Add support for delegate function as TransitCallback (Fix #997) 2018-12-28 16:42:54 +01:00
Laurent Perron
75876db069 Merge branch 'master' of github.com:google/or-tools 2018-12-18 16:23:48 +01:00
Laurent Perron
1d04b1738d move routing code around; cleanup examples 2018-12-18 15:45:34 +01:00
Corentin Le Molgat
f4f7dd06e2 dotnet: Add all AssignmentContainer template intantiation 2018-12-18 14:40:45 +01:00
Laurent Perron
37776ddc6f cleanup routing API and examples on transits 2018-12-17 09:10:37 +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
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
Laurent Perron
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Laurent Perron
7432ea5102 expose SolutionCollector director in C# #234 2018-09-07 11:54:19 +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
10db4c7cd0 minor changes 2017-12-14 12:45:54 +01:00
Laurent Perron
8d7320b962 deep sync with base library; prepare for abseil.io integration 2017-12-08 14:52:49 +01:00
ziad
4a8700edbd fix DisownAndGetPermanentCallback not getting called on NodeEvaluator2 when array is used. 2017-09-07 00:57:03 -07:00