Commit Graph

42 Commits

Author SHA1 Message Date
Manuel Ruiz
f50fc893a8 xpress integration in or-tools 2019-08-06 18:21:29 +02:00
Laurent Perron
d4c1816733 revamp gurobi direct proto solve 2019-07-24 16:49:10 -07:00
Laurent Perron
738d23fe4a direct gurobi proto solve; support SOS in gurobi proto solve 2019-07-22 11:10:30 -07:00
Laurent Perron
4510eee224 bump linear solver code, add direct to proto solver for scip and gurobi, currently untested 2019-07-18 05:53:45 -07:00
Laurent Perron
8a4ae8bff0 working SetNumTheads in Python/Java/C#; Working SetHint in java/C# 2019-06-29 12:35:15 +02:00
Laurent Perron
7487f03c65 add branching priorities to MPSolver (supported by SCIP and Gurobi) 2019-06-17 11:35:17 +02:00
Corentin Le Molgat
b40d6b59e3 Fix windows linear_solver.cc
Windows error
```
make cc
...
cl ...\\linear_solver.obj linear_solver.cc
.\\ortools\\linear_solver\\linear_solver.cc(466): error C2131: expression did not evaluate to a constant
dependencies\\install\\include\absl/strings/string_view.h(186): note: a non-constant (sub-)expression was encountered
```
see: https://ci.appveyor.com/project/lperron/or-tools-98u1n/builds/24076151/job/orlns0nwbidxytry#L4312
2019-04-25 10:00:21 +02:00
Laurent Perron
2a4fc564b4 add constraint with index in linear solver (API + Proto); rewrite MPS reader/writer; update base library as needed 2019-04-18 19:18:48 +02:00
Laurent Perron
506112701b add indicator constraint to the linear solver with SCIP and gurobi support 2019-04-18 16:44:47 +02:00
Laurent Perron
0b4cd18625 minor typos 2019-03-25 11:26:21 +01:00
Laurent Perron
64946d2083 fix for windows 2019-01-03 01:00:20 +01:00
Laurent Perron
916e3136ec add new error type in status/canonical_errors; savings improvement in the routing library; scip_interface rewrite; first steps in CP-SAT cuts management 2019-01-02 16:35: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
Laurent Perron
87b9d55b21 update license headers 2018-11-10 18:00:53 +01:00
Laurent Perron
4e893e5080 remove solow-halim glop preprocessor as the interface has changed a lot; add a proper domain class for CP-SAT integer variables, rewrite preprocessor and other parts of the solver to use it 2018-10-02 10:35:52 +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
4caaef3c23 deep sync with base library renaming; lint checking; Speedup sat; new crash procedure for glop 2018-08-28 11:19:49 +02:00
Laurent Perron
76963f4166 add optional template; use it in linear solver; add const in gurobi interface 2018-07-25 10:22:07 -07:00
Laurent Perron
54f54d31a9 fix 2018-07-24 13:59:59 -07:00
Laurent Perron
7a1889bb1f make name -> var or constraint optional in linear solver 2018-07-24 13:23:58 -07:00
Laurent Perron
a9dd4aec9a Remove CoeffMap typedef in linear_solver 2018-07-24 09:32:14 -07:00
Laurent Perron
70e73d8754 clang-format 2018-06-08 16:40:43 +02:00
Laurent Perron
df333efbcd rewrite drat checker for sat; make fz presolve deterministic; more optims on sat internals 2018-05-03 15:00:06 +02:00
Laurent Perron
8623fc3580 speed up sat cumulative; add namespaces to base library + fix code 2018-04-11 13:00:30 +02:00
Laurent Perron
9044de9355 new heuristics to minimize clauses in SAT; base library changes 2018-03-06 18:17:36 +01:00
Laurent Perron
07a1078e77 change API or LP writer to return util::status 2018-02-12 11:38:22 +01:00
Laurent Perron
604587eec7 minor changes; change the search parameters in the cp_model.proto 2018-01-15 10:41:09 +01:00
Laurent Perron
bb605a1a8a more work on base libraries 2017-12-11 11:02:46 +01:00
Laurent Perron
8d7320b962 deep sync with base library; prepare for abseil.io integration 2017-12-08 14:52:49 +01:00
Laurent Perron
c363991e2b rearchitecture glop code 2017-12-05 16:45:10 +01:00
Laurent Perron
e14ee86de3 move rcpsp parser to ortools/data; continue working on SAT 2017-11-07 15:45:52 +01:00
Laurent Perron
2c7a8bf8f6 change copyright date 2017-10-17 13:08:10 +02:00
Laurent Perron
e8540c1363 add vrp constraint to the sat solver; remove old no_cycle code 2017-10-16 11:20:54 +02:00
Laurent Perron
086640da72 move graph code around; improve sat code 2017-09-29 15:08:48 +02:00
Laurent Perron
e42ef1e06e cleanups and minor syncs; sat: add LP guided heuristics 2017-08-03 10:20:59 -07:00
Laurent Perron
0e50e4f5b8 work on sat; misc sync 2017-06-21 11:40:11 +02:00
Laurent Perron
cbd8ba8641 introduce array slices and use them in sat 2017-06-01 16:28:29 +02:00
Laurent Perron
7a0ceca73d add a new dependencies: google/glog; Cleanup Makefile.local 2017-05-23 11:55:36 +02:00
Laurent Perron
347186ecae sync with internal code; minor changes 2017-05-16 10:43:33 +02:00
Laurent Perron
8c08d72260 replace hash_map and hash_set by unordered_map and unordered_set 2017-04-27 17:34:24 +02:00
Laurent Perron
4db7d3bc4e remove hash_map/hash_set; replace with std::unordered_map|set 2017-04-27 14:14:05 +02:00
Laurent Perron
66b8d23079 move src to ortools; simplified python generation; remove some namespaces in the ortools/base helper files 2017-04-26 17:30:25 +02:00