Commit Graph

1042 Commits

Author SHA1 Message Date
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
2574ce8d3e Merge branch 'master' of github.com:google/or-tools 2018-12-07 19:44:03 +01:00
Laurent Perron
c36ac046f7 prepare c++ code for int64 = int64_t 2018-12-07 19:43:46 +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
Laurent Perron
29064869ed remove obsolete test after code removal 2018-12-03 10:51:15 +01:00
Laurent Perron
8b6da37ed5 revert last commit 2018-12-01 16:06:18 +01:00
Laurent Perron
7ca7fc393a remove template specialization in min/max after int64 revamp 2018-12-01 15:20:35 +01:00
Corentin Le Molgat
d730c50065 Update generate_dotnet_proj script 2018-11-30 15:30:40 +01:00
Laurent Perron
0b034b6e30 fix cmakefile 2018-11-30 14:48:55 +01:00
Laurent Perron
798b9e73e2 fix the rest of the C++ examples 2018-11-30 14:48:55 +01:00
Laurent Perron
fe0249dd64 fix cvrptw_lib.h 2018-11-30 14:48:55 +01:00
Corentin Le Molgat
c2ae098d34 Apply yapf on examples/python/*.py 2018-11-30 14:48:55 +01:00
Laurent Perron
f2573d33b1 Fix merge abseil - v6.10 2018-11-30 14:48:55 +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
9991c88819 fix 2018-11-26 11:03:04 +01:00
Corentin Le Molgat
c404146530 Bump .Net proj to 6.10.* 2018-11-26 09:49:32 +01:00
Laurent Perron
4afccdb52c network routing -> network_routing_sat 2018-11-25 11:10:12 +01:00
Laurent Perron
46a78c021d golomb -> golomb_sat 2018-11-24 23:06:05 +01:00
Laurent Perron
dbbcc15359 reimplement costas_array with the CP-SAT solver. 2018-11-24 19:34:08 +01:00
Laurent Perron
8581d2a552 add support for parameters 2018-11-24 16:01:12 +01:00
Corentin Le Molgat
4ae6e1fea1 Fix examples/cpp/CMakeLists.txt 2018-11-23 15:51:38 +01:00
Laurent Perron
4c661f07ae remove jobshop_earlytardy; add support for earliness in jobshop_sat; improve jobshop_scheduling_parser to support jet file (Jobshop Early Tardy) 2018-11-23 15:25:12 +01:00
Corentin Le Molgat
b6f0705a3d Fixup CMakeLists.txt 2018-11-23 11:10:54 +01:00
Corentin Le Molgat
5e78dc2a5e Fixup examples/cpp/CMakeLists.txt 2018-11-23 10:51:12 +01:00
Corentin Le Molgat
f63f6f7051 Move some examples to constraint_solver/samples 2018-11-23 10:49:46 +01:00
Corentin Le Molgat
6cdc613a60 Cleanup examples/cpp/CMakeLists.txt 2018-11-23 10:29:34 +01:00
Corentin Le Molgat
60fa2fb271 Make FAP a header only library 2018-11-23 08:52:59 +01:00
Corentin Le Molgat
20d9bc0e50 Make Dimacs a header only library
- Remove special case in Makefile rules
2018-11-22 18:14:06 +01:00
Corentin Le Molgat
98cbd29324 Make cvrptw_lib a header only lib.
- don't need extra stuff in Makefile anymore
2018-11-22 18:04:57 +01:00
Laurent Perron
f58a933be3 remove 2018-11-22 05:35:33 -08:00
Laurent Perron
6a7132377e remove global_arith 2018-11-22 04:42:33 -08:00
Laurent Perron
7566c682ca remove jobshop cp examples; keep jobshop_earlytardy for now 2018-11-22 04:41:10 -08:00
Laurent Perron
75ddef3af0 add reference to the slitherlink problem 2018-11-22 04:37:08 -08:00
Laurent Perron
7b5f8c6db9 merge 2018-11-22 04:19:35 -08:00
Laurent Perron
37ef66ef86 replace magic_square by magic_square_sat with much improved performance 2018-11-22 04:17:54 -08:00
Corentin Le Molgat
24ad8771ef Format examples/cpp 2018-11-22 13:15:13 +01:00
Laurent Perron
d5bd0940cd remove cryptarithm example 2018-11-22 01:38:13 -08:00
Laurent Perron
78d31daf0f remove model_util example; port slitherlink to CP-SAT; port sports_scheduling to CP-SAT; fix test_cc 2018-11-22 01:30:28 -08:00
Laurent Perron
5d26ad890f sync examples 2018-11-21 11:00:26 -08: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
Laurent Perron
44e52c1ef8 mostly PascalCase -> sname_case 2018-11-20 05:44:21 -08:00
Laurent Perron
3fae2c719f improve sat example 2018-11-20 04:56:59 -08:00
Laurent Perron
9691161712 port examples to the CP-SAT solver 2018-11-20 04:35:48 -08:00
Laurent Perron
df8c8892f3 ported most official python cp examples to CP-SAT; cleaned up a few of them 2018-11-19 20:42:23 -08:00
Laurent Perron
4379a89323 rename sudoku.py to sudoky_sat.py 2018-11-19 18:05:31 -08:00