Commit Graph

39 Commits

Author SHA1 Message Date
Laurent Perron
e151e00818 fix output 2022-04-02 19:43:07 +02:00
Laurent Perron
c3be16e0b3 [LP-DATA] use strong integers; enable parsing of MPS models in strings 2022-02-15 17:57:21 +01:00
Laurent Perron
95dd14be0d misc sync code 2022-01-21 11:59:32 +01:00
Laurent Perron
03f1fc66ec reorder includes 2022-01-19 19:37:23 +01:00
Corentin Le Molgat
904f9c67cd Sync google/github 2022-01-17 15:47:25 +01:00
Laurent Perron
11450544b3 update mps reader to support semi continous variables 2021-11-16 23:53:16 +01:00
Laurent Perron
1c512fd12d change a bit the export code: propagate effect 2021-09-07 11:53:01 +02:00
Laurent Perron
6011962739 use absl 2021-08-18 11:21:13 +02:00
Laurent Perron
2537644c71 fix MPS reader 2021-04-14 14:44:29 +02:00
Mizux Seiha
8bb54b04ef Bump Copyright to 2021
FYI:
find ortools \( -type d -name .git -prune \) -o -type f -print0 | xargs -0 sed -i 's/\(Copyright 2010\)-2018/\1-2021/g'
2021-04-01 21:00:53 +02:00
Laurent Perron
c3acf7bff4 int64 -> int64_t 2021-03-11 21:05:34 +01:00
Laurent Perron
6467dc69b0 reformat the code; [CP-SAT] add dominated columns presolve 2020-10-28 13:42:51 +01:00
Mizux Seiha
20d0496bfb reapply google format 2020-10-23 00:45:17 +02:00
Laurent Perron
a4258f2bdf switch flags setters and getters to the absl format 2020-10-21 00:21:54 +02:00
Laurent Perron
bcb7b3073d large synchro with internal code: linear solver: introduce intermediate SCIP layer called gscip; sat: more work on slow propagation detection; base: remove statusor, use abseil version; constraint solver: more work on internal local search 2020-10-18 16:38:25 +02:00
Laurent Perron
581d5606e0 fix #2005; massive rewrite of pure sat processing; RINS/RENS improvements in CP-SAT; get rid of base/status.h in favor of the absl version 2020-05-06 18:22:10 +02:00
Corentin Le Molgat
2d8c863c2a Sync g3 -> gh Part 3 2020-03-10 11:06:08 +01:00
Laurent Perron
2ff000ab9a bump abseil to the latest version, adapt the code all around 2019-11-20 14:28:11 -08:00
Laurent Perron
39cae88902 add new routing LS operator; add Abs() propagator + presolve to CP-SAT; cache RINS info in CP-SAT 2019-04-25 18:12:35 +02:00
Laurent Perron
8b5076502b rename MPSReaderAux to MPSReaderImpl 2019-04-25 13:57:52 +02:00
Laurent Perron
99bbbfce9a remove isnan() test on integer 2019-04-24 21:05:54 +02:00
Laurent Perron
dafea0aded move mps reader to .cc 2019-04-24 17:51:41 +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
087868bcc2 maintenance on swig files; merge presolve context and expand context; minor fixes in the code 2019-02-05 15:06:47 +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
4caaef3c23 deep sync with base library renaming; lint checking; Speedup sat; new crash procedure for glop 2018-08-28 11:19:49 +02:00
Corentin Le Molgat
ef71fe4b7d mps_reader.cc: add direct dependency to glop/parameters.pb.h
mps_reader.h depends on lp_data.h which depends on parameters.pb.h

note: unfortunately gen_deps currently only look includes in foo.h and foo.cc for building foo.o
2018-07-13 08:55:40 +02:00
Laurent Perron
70e73d8754 clang-format 2018-06-08 16:40:43 +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
377571c954 fix mps reader 2018-02-12 11:37:45 +01:00
Laurent Perron
94ee08543c fix typos 2017-12-14 12:46:25 +01:00
Laurent Perron
3af045b0b1 remove ortools/util/filelineiter.h in favor of ortools/base/filelineiter.h 2017-12-11 15:52:26 +01:00
Laurent Perron
bb605a1a8a more work on base libraries 2017-12-11 11:02:46 +01:00
Laurent Perron
cfdaf3972e polish previous CL on base libraries upgrade 2017-12-08 16:08:16 +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
2c7a8bf8f6 change copyright date 2017-10-17 13:08:10 +02:00
Laurent Perron
c36066c39c improve scaling 2017-09-06 10:17:17 +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