Commit Graph

162 Commits

Author SHA1 Message Date
Laurent Perron
cc71b3ee57 cleanup semantics of under-specified constraint in model_builder python 2024-03-30 10:53:14 +01:00
Laurent Perron
baa65a12b7 reformat 2024-03-26 12:33:58 +01:00
Corentin Le Molgat
4adf53b097 python: cleanup export from google3 2024-03-18 10:24:56 +01:00
Laurent Perron
f6518fcd2b python black reformat 2024-03-14 15:05:07 +01:00
Mizux Seiha
52245b251d cmake: Fix eigen usage 2024-02-09 01:00:02 +01:00
Laurent Perron
fb501409eb fix lp_test.py in debug 2024-01-31 15:18:13 +01:00
Corentin Le Molgat
75f197409a cmake: rework add_python_test()
* Add FILE_NAME option
* add optional COMPONENT_NAME option
  note: needed if test.py is not in a ortools/<component>/python/ dir
2024-01-15 13:33:49 +01:00
Mizux Seiha
a76bf1c5dd bump license boilerplate 2024-01-04 13:43:15 +01:00
Laurent Perron
0bb7d0c58b Merge pull request #3966 from rte-france/feature/xpress_only
Improve the Xpress interface and add dynamic loading of the Xpress library
2023-12-11 11:48:24 +01:00
Corentin Le Molgat
de938c4ac3 bazel: add with_cp_sat flag 2023-11-29 11:41:45 +01:00
Laurent Perron
6136a47c99 improvement to PDLP, remove most GLPK from tests, add py.typed for CP-SAT and model_builder python modules: fix #3993 2023-11-22 11:43:44 +01:00
Laurent Perron
72f274f844 Change proto to/from file API to use absl::StatusOr; add reader/writer proto_file to model_builder 2023-11-20 16:13:03 +01:00
Florian OMNES
2f543db1bb Merge remote-tracking branch 'google/main' into feature/temporary-for-squash
Co-authored-by: Peter MITRI <peter.mitri@rte-france.com>
2023-11-20 12:48:14 +01:00
Laurent Perron
b5f749b794 add import/export with proto on model_builder; add support for proto in solve_model.py 2023-11-19 07:22:44 +01:00
Laurent Perron
0ccc07f288 add glop_proto_solver; split bazel targets for proto_solver 2023-11-17 14:17:52 +01:00
Laurent Perron
553ef23f2d revert mpl2 commit 2023-11-09 13:46:17 +01:00
Laurent Perron
38dff7fbeb add #define EIGEN_MPL2_ONLY everywhere, fix #3979 2023-11-09 11:33:38 +01:00
Andrea Sgattoni
7161d7a2d2 Merge branch 'google/main' into feature/xpress_only_RTE 2023-11-07 18:34:43 +01:00
Laurent Perron
f7f79cd404 improve typing 2023-11-07 14:07:43 +01:00
Andrea Sgattoni
546e0f506d Merge branch 'google/main' into feature/xpress_only_RTE 2023-11-07 10:50:34 +01:00
Laurent Perron
330a4d9508 polish 2023-11-06 18:08:34 +01:00
Andrea Sgattoni
31330208b4 Merge branch 'google/main' into feature/xpress_only_RTE 2023-11-06 18:00:05 +01:00
Laurent Perron
7bdde984aa model_builder python: ModelBuilder -> Model, ModelSolver -> Solver; fix bug in enforced linear support; tweak wrappers: 2023-11-06 16:16:38 +01:00
Laurent Perron
fcd64e6b97 polish on model_builder code 2023-11-06 15:20:03 +01:00
Andrea Sgattoni
d607131ed8 Merge branch 'google/main' into feature/xpress_only_RTE 2023-11-06 09:39:37 +01:00
Laurent Perron
686b530f10 [ModelBuilder] Add clear_terms and set_coefficient everywhere; finish indicator constraints in C# 2023-11-05 14:40:40 +01:00
Laurent Perron
ce9f1ed6d2 model builder: add clear_terms API; add enforced linear constraint in java + minimal test 2023-11-05 12:41:22 +01:00
Laurent Perron
1a610bd7ef additional work on indicator constraints in model_builder python 2023-11-05 10:06:20 +01:00
Laurent Perron
8fc323ed9e add indicator constraints to model_builder python 2023-11-05 09:51:40 +01:00
Laurent Perron
9d9ca5ccaf add hinting support for model_builder 2023-11-04 20:58:00 +01:00
Andrea Sgattoni
ba10b5ae5e remove call backs from java and python swig-files 2023-10-27 09:42:36 +02:00
Andrea Sgattoni
3c4a76e68f update xpress interface with dynamic load 2023-10-27 09:42:35 +02:00
Laurent Perron
9939e9d074 polish 2023-10-24 13:33:46 +02:00
Laurent Perron
d86dfadc86 add model cloning to model_builder python + sample 2023-10-24 11:44:43 +02:00
Corentin Le Molgat
69874c9b26 fixup from google3 2023-10-09 15:07:30 +02:00
Laurent Perron
fa6883d544 mostly cleaning: remove integral_types.h and basictypes.h 2023-08-24 14:52:54 +02:00
Laurent Perron
c8597d302c one more pandas model_builder test 2023-08-03 11:44:58 -07:00
Laurent Perron
5b8cdcd6bf [ModelBuilder] big update on the code; remove hash table, use c++ canonicalization of linear expressions; remove code duplication 2023-07-27 08:50:52 -07:00
Laurent Perron
f540a5fbc2 reformat 2023-07-24 13:20:13 -07:00
Laurent Perron
49c8f26ef2 [ModelBuilder] fix test with SCIP OFF 2023-07-22 07:23:15 -07:00
Laurent Perron
0552bed7bc another typing fix 2023-07-21 21:16:28 -07:00
Laurent Perron
44cff7813f another typing fix 2023-07-21 19:29:35 -07:00
Laurent Perron
1135c58520 use python3.7+ typing in model_builder and cp_model 2023-07-21 18:32:44 -07:00
Laurent Perron
9a5c7e8dad use python3.7+ typing in model_builder and cp_model 2023-07-21 16:42:55 -07:00
Laurent Perron
271cf0324e [ModelBuilder] do not add term 0 * var 2023-07-20 15:36:45 -07:00
Laurent Perron
b82cd22d7c [ModelBuilder] Add set_coefficient API, fix add_term to not create duplicate variable entries 2023-07-20 15:13:56 -07:00
Laurent Perron
a273b959f4 more model_builder python APIs 2023-07-20 14:01:10 -07:00
Laurent Perron
3cfffecef7 thorough clamping of infinity for SCIP; added APIs to model_builder python 2023-07-20 08:52:32 -07:00
Laurent Perron
baf4a82e9e commit wrong indent; but this is the output of our export 2023-07-17 14:43:42 -07:00
Laurent Perron
3acda0a0e9 switch model_builder python from numpy to pandas 2023-07-09 13:54:23 +02:00