Commit Graph

907 Commits

Author SHA1 Message Date
Laurent Perron
e4423dc90e scheduling example with transition times and transition costs 2018-09-14 17:26:33 +02:00
Laurent Perron
23a637294d scheduling example with transition times and transition costs 2018-09-14 17:14:29 +02:00
Corentin Le Molgat
5da668b0a7 dotnet: EnableDefaultCompileItems -> EnableDefaultItems in .proj 2018-09-14 11:19:38 +02:00
Laurent Perron
01815e2d6d fix bug in the sat scheduling code found by the rcpsp 2018-09-13 16:26:03 +02:00
Laurent Perron
f99d71438d remove rcpsp_sat cpp example 2018-09-12 19:59:17 +02:00
Laurent Perron
b676ac3c70 fix jobshop_sat 2018-09-12 18:32:05 +02:00
Laurent Perron
34f8cf3f6a use multiple enforcement literals in rcpsp 2018-09-12 18:25:43 +02:00
Laurent Perron
8441579339 fix jobshop_sat.cc 2018-09-12 17:53:34 +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
Laurent Perron
f4756e36c5 fix a few lint warnings 2018-09-09 22:11:37 +02:00
Laurent Perron
7165366a1f polish task allocation problem 2018-09-09 18:08:31 +02:00
Laurent Perron
267861ac50 reident 2018-09-09 15:36:34 +02:00
Laurent Perron
cb7ae1359a fix code 2018-09-09 15:28:43 +02:00
Laurent Perron
28c2d91345 Update task_allocation_sat.py 2018-09-09 15:22:56 +02:00
Laurent Perron
b594a0ee5d task allocation problem from a blog 2018-09-09 15:20:46 +02:00
Laurent Perron
9eeda9e498 fix a few pylint problems 2018-09-08 17:56:07 +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
6170e82097 fix a few warnings in examples 2018-09-06 22:57:59 +02:00
Corentin Le Molgat
3713802c85 Fixup cvrptw_lib::DisplayPlan 2018-09-06 17:26:36 +02:00
Corentin Le Molgat
c1962fada8 python: Fix cvrptw_lib NodeIndex in display function 2018-09-06 15:26:53 +02:00
Laurent Perron
61125b4b48 reindent python examples, polish a few of thems 2018-09-06 15:09:32 +02:00
Laurent Perron
6368e91bd3 fix vendor_scheduling_sat + notebook 2018-09-05 14:32:49 +02:00
Laurent Perron
1cda356ebe fix vendor scheduling sat notebook 2018-09-05 14:30:42 +02:00
Laurent Perron
c0eac159c2 update notebooks to remove main() method 2018-09-05 14:27:48 +02:00
Laurent Perron
9a116eba39 remove SolutionObserver is sat/swig_helper.h; rename WithObserver into WithCallback 2018-09-04 18:47:10 +02:00
Laurent Perron
beb05f0079 #303 Sat implementation of vendor scheduling, fixed a few bugs found in the process 2018-09-02 17:15:55 +02:00
Laurent Perron
b3743f4cff Fix #40 + test 2018-09-02 09:24:24 +02:00
Laurent Perron
4b5b2a44d6 fix file comment 2018-09-01 16:55:28 +02:00
Laurent Perron
3c66f269c9 remove missing example from README 2018-09-01 16:55:03 +02:00
Laurent Perron
5824112e27 fix issue 260 for the CP-SAT solver 2018-09-01 08:48:43 +02:00
Laurent Perron
265e54a9aa simplify school scheduling sat example 2018-09-01 08:13:21 +02:00
Laurent Perron
651e44cf0a remove OptionalIntVar from the sat Python API 2018-08-31 16:56:55 +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
Laurent Perron
15e17afb02 remove not exported example from README 2018-08-31 08:51:00 +02:00
Laurent Perron
5e47ffaceb fix nqueens2.cc #695 2018-08-30 23:36:56 +02:00
Laurent Perron
10604631e0 Merge branch 'master' of https://github.com/google/or-tools 2018-08-30 16:30:13 +02:00
Laurent Perron
e8d5858e67 revamp sat python solution callback, adds the ability to stop search from the solution callback. 2018-08-30 16:27:58 +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
4320b494af python: fix test_python with python2.7 2018-08-30 10:11:24 +02:00
Laurent Perron
ca650dc623 fix some more python examples 2018-08-30 08:22:44 +02:00
Laurent Perron
2d3c2f1bf7 fix python examples for python3 2018-08-30 07:59:49 +02:00
Corentin Le Molgat
2e3131b643 python: Rework examples target
- Fix default solver to use CBC instead of GLPK (which is optional)
- Fix few examples which doesn't compile against python2.7
- Add all examples to target test_python
  - Few examples disabled since they are too long
2018-08-29 16:56:25 +02:00
Corentin Le Molgat
a340d87b04 java: Add Vrp.java example 2018-08-27 11:59:55 +02:00
Yasser A
e6d57a5966 divide the total z by 100 to match fruits final results 2018-08-24 12:57:41 +02:00
Laurent Perron
57bf90745d chemical balance problem solved by SAT and LP 2018-08-20 09:09:08 +02:00
Laurent Perron
98f243b438 Merge branch 'master' of https://github.com/google/or-tools 2018-08-16 07:33:33 -07:00
Laurent Perron
f0a4199000 fix HIGHEST_MAX 2018-08-16 07:33:10 -07:00