143 Commits

Author SHA1 Message Date
Laurent Perron
2861b24ddb change routing disjunction API to use list of int instead of int64 for nodes 2018-12-12 11:02:24 +01:00
Laurent Perron
90ae3ebbcd fix C# code 2018-12-11 18:12:59 +01:00
Laurent Perron
32f43eb232 fix csflow.cs 2018-12-11 18:09:18 +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
Corentin Le Molgat
9aed92069c Remove ReadKey from ShiftSchedulingSat 2018-12-07 17:14:28 +01:00
Laurent Perron
448cdaae6d Merge branch 'master' into master 2018-12-07 10:45:27 +01:00
stuarthillary
694e6cd961 Port the Python example solve_shift_scheduling to C# 2018-12-07 08:53:22 +00:00
Corentin Le Molgat
13c82b0bd4 Add PRE_RELEASE support
Python PEP440: https://www.python.org/dev/peps/pep-0440/#pre-releases
.Net: https://docs.microsoft.com/en-us/nuget/create-packages/prerelease-packages

note: Microsoft has a 3 years still open bug to manage prerelease in version
see: https://github.com/NuGet/Home/issues/912
2018-12-06 14:55:32 +01:00
Corentin Le Molgat
756e36bab5 Bump version to 7.0
- Also regenerate .Net proj to avoid sample to use the published 6.10 nuget package
2018-12-06 09:28:49 +01:00
Corentin Le Molgat
d730c50065 Update generate_dotnet_proj script 2018-11-30 15:30:40 +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
c404146530 Bump .Net proj to 6.10.* 2018-11-26 09:49:32 +01:00
Laurent Perron
1831f30eba port more C# CP examples to CP-SAT 2018-11-20 14:47:46 -08:00
Laurent Perron
dbbe4d9829 port some CP C# examples to CP-SAT 2018-11-20 14:21:43 -08:00
Corentin Le Molgat
e5da9b92f3 Update dotnet sat samples 2018-11-14 14:08:40 +01:00
Laurent Perron
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Corentin Le Molgat
2e5e79cdc7 Add linear_solver/samples/SimpleLPProgram 2018-11-09 12:53:46 +01:00
Corentin Le Molgat
ef89d60403 Add Minimal README.md to examples 2018-11-08 10:22:10 +01:00
Laurent Perron
475ccd99e3 move contrib examples to a dedicated contrib directory 2018-11-07 20:49:03 +01:00
Corentin Le Molgat
f7060f83a5 Rename SimpleProgram.fs to SimpleProgramFSharp.fs
- Avoid collision with SimpleProgram.fs binary output
2018-11-06 18:01:21 +01:00
Corentin Le Molgat
34e2675112 Fix SimpleProgram.fs entry point 2018-11-06 16:32:26 +01:00
Corentin Le Molgat
a0c3fe2ee1 Fixup SimpleProgram.fs 2018-11-06 15:29:21 +01:00
Corentin Le Molgat
8eeadbecce Add SimpleProgram
This is the example use in optimization site:
GUIDES/Introduction/GetStarted/<lang>/RunningProgram
2018-11-06 14:36:21 +01:00
Corentin Le Molgat
027f5cc3f8 Add missing basic examples
C++:
 - [Up] linear_programming
 - [Up] integer_programming
 - constraint_programming_CP / rabbits_pheasants_cp
 - knapsack
 - max_flow / min_cost_flow
 - tsp / vrp
note: previous "fuzzy" tsp has been renamed random_tsp.

.Net:
 - vrp
2018-09-26 13:15:34 +02:00
Corentin Le Molgat
a2978f293d Fix typo in cstsp.cs 2018-09-26 13:15:34 +02:00
Corentin Le Molgat
6bbf49935b dotnet: Add examples/tests 2018-09-18 09:16:51 +02:00
Corentin Le Molgat
cf2f7ffdb6 dotnet: bump csproj Google.OrTools to 6.9 2018-09-17 15:43:10 +02:00
Corentin Le Molgat
5da668b0a7 dotnet: EnableDefaultCompileItems -> EnableDefaultItems in .proj 2018-09-14 11:19:38 +02:00
Laurent Perron
428e272ccc add ModelStats and CpSolverResponseStats for SAT/{Python|Java|C#}; enable multiple enforcement literals for a few constraints; small fixes, typo corrections 2018-09-12 15:07:23 +02:00
Corentin Le Molgat
0ba343e0cd Fixup F# examples 2018-09-07 16:59:47 +02:00
Corentin Le Molgat
5a55bb655a Update FSharp examples so all use .NetCoreApp2.1 2018-09-07 12:58:26 +02:00
Laurent Perron
1719dc993a remove OptionalIntVar from sat C# API #836 2018-08-31 16:36:17 +02:00
Corentin Le Molgat
e6013f3e6d dotnet: Add test_dotnet_[cf]sharp to test_dotnet 2018-08-31 13:35:13 +02:00
Corentin Le Molgat
42d7c276ab dotnet: rework example layout
- Fix examples using MPConstraint::Activity instead of MPSolver
- Move all examples to exmaples/dotnet
- remove netfx sub-directories
- Add all examples to target test_dotnet
  - still few disabled since they are too long
- Add tools/generate_examples_csproj.sh to generate .*proj files
2018-08-30 11:58:47 +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
Corentin Le Molgat
242a7714af Cleanup example/dotnet/csharp/a_puzzle.cs 2018-08-16 15:59:11 +02:00
Laurent Perron
0152168fb7 add C# sat code samples in ortools/sat/samples; remove old code_samples_sat.* files 2018-07-17 14:00:18 -07:00
Corentin Le Molgat
ca1c7917c7 dotnet: fixup indentation in tsp.cs 2018-07-17 17:11:41 +02:00
Corentin Le Molgat
d5d4b48657 dotnet: add examples to test_dotnet 2018-07-17 15:03:10 +02:00
Corentin Le Molgat
898e7bc055 dotnet: .Net example update 2018-07-10 14:38:49 +02:00
acco32
87cc1c6d21 fix typo 2018-07-06 12:31:30 -07:00
acco32
6ab609f17b organize examples 2018-07-05 17:51:49 -07:00
acco32
0a822b6617 Add examples for C# 2018-07-03 22:21:35 -07:00