Commit Graph

82 Commits

Author SHA1 Message Date
Corentin Le Molgat
22356ff523 Sync g3 -> gh part_2 2020-03-09 18:34:21 +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
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
72ae26505e fix 2019-08-06 16:43:18 -07:00
Laurent Perron
5f9a56b8aa 7.2 -> 7.3 2019-08-05 09:39:01 -07:00
Laurent Perron
373f84ba5f remove support for C# fz 2019-07-19 11:37:37 -07:00
stuarthillary
ef62cc577d Further fix to ShiftSchedulingSat.cs 2019-07-04 17:11:49 +01:00
stuarthillary
b8b7a5b196 Fix ShiftSchedulingSat.cs example in same way as Python fixes 2019-07-04 13:29:41 +01:00
Laurent Perron
0c9b6d44d9 update csproj 2019-06-30 11:06:28 +02:00
Laurent Perron
2dbdfdcc30 add time limit to ShiftSchedulingSat.cs example 2019-05-16 15:27:07 +02:00
Laurent Perron
ae4cb47fd9 patch example 2019-05-16 13:33:46 +02:00
Laurent Perron
b886f1ddbc fix ShiftSchedulingSat.cs; improve linear code in CP-SAT C# to make it more robust 2019-05-16 11:45:46 +02:00
Laurent Perron
71da4da480 fix NetworkRoutingSat example 2019-05-16 08:05:05 +02:00
Laurent Perron
82d234dab4 real fix 2019-05-15 21:42:58 +02:00
Laurent Perron
8d5f34d2d4 fix another C# example 2019-05-15 21:30:18 +02:00
Laurent Perron
ff28ad2f63 rewrite C# CP-SAT linear layer; still one bug 2019-05-13 10:59:04 +02:00
Laurent Perron
bf7e915664 fix C# example 2019-05-08 15:24:06 +02:00
Corentin Le Molgat
bef0cd9d17 .Net: fixup csproj generator 2019-05-07 12:59:44 +02:00
Corentin Le Molgat
a446f45176 Bump Version 7.0 -> 7.1 2019-05-07 11:37:58 +02:00
Laurent Perron
685c63e7e6 change shift scheduling example to use 8 workers 2019-04-24 10:53:27 +02:00
stuarthillary
180212154e Port the C++ example network_routing_sat to C# 2019-03-12 15:28:48 +01:00
stuarthillary
98680ba490 Remove references to tsp and vrp projects from examples solution file 2019-03-11 14:50:58 +01:00
Corentin Le Molgat
8fbf82332c Fix cscvrptw.cs 2019-02-21 08:37:37 +01:00
Corentin Le Molgat
1b76065bc4 Fix csls_api.cs 2019-02-21 08:37:24 +01:00
Corentin Le Molgat
781e3790f5 Fix cstsp.cs 2019-02-21 08:37:11 +01:00
Corentin Le Molgat
43fb0716fa Update .csproj 2019-02-19 11:56:59 +01:00
stuarthillary
9a35fa6e7a Ported the Python example balance_group_sat.py to C# 2019-02-14 23:13:16 +00:00
Corentin Le Molgat
af29f63730 Fix dotnet build 2019-01-02 13:35:23 +01:00
Laurent Perron
cf73e298a2 move ObjectiveSolutionPrinter to new SearchHelpers.cs CP-SAT C# code 2018-12-28 18:17:41 +01:00
Laurent Perron
f832cfc350 Merge branch 'master' of github.com:google/or-tools 2018-12-28 09:14:19 +01:00
Laurent Perron
0eae67a2ee fix display of objective 2018-12-28 09:14:13 +01:00
Corentin Le Molgat
9ad342903c mv tsp.cs & vrp.cs to cp/samples 2018-12-27 11:06:02 +01:00
Laurent Perron
75876db069 Merge branch 'master' of github.com:google/or-tools 2018-12-18 16:23:48 +01:00
Laurent Perron
82dc07c200 speedup SpeakerSchedulingSat.cs by using parallelism 2018-12-18 16:10:22 +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
39f30fb178 revert last change on the routing API; report new best bound of the SAT solver in the log 2018-12-14 14:25:52 +01:00
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