Commit Graph

50 Commits

Author SHA1 Message Date
Mizux Seiha
7a823314eb export from google3 2022-06-21 11:35:03 +02:00
Corentin Le Molgat
c7120439d4 Bump license date 2022-06-17 14:23:23 +02:00
Laurent Perron
edb66aaed5 [ROUTING] major improvement on filters/first solution heuristics/time,break placements 2021-12-05 12:36:59 +01:00
Corentin Le Molgat
52c9b0b77f constraint_solver: Sync 2021-11-03 12:57:26 +01:00
Corentin Le Molgat
eb0f319cd6 Sync github with google 2021-10-22 00:50:21 +02:00
Laurent Perron
062b113f03 fix #2817 2021-10-19 09:36:59 +02:00
Corentin Le Molgat
c45cd04d1c Fix java wrappers 2021-09-10 16:25:35 +02:00
Corentin Le Molgat
3327838e5a java: Fix constraint_solver build 2021-09-03 17:01:37 +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
Corentin Le Molgat
a40143cdd2 cpp: Migrate int64 to int64_t 2021-04-01 20:20:43 +02:00
Corentin Le Molgat
b5cbf77a73 Export from Google 2021-02-10 19:51:27 +01:00
Corentin Le Molgat
7b10a5e0c0 Export Google dev to github 2021-02-10 16:01:54 +01:00
Laurent Perron
d2147306e2 reformat cp code; add bandit concatenate operator for the routing library; tweak var domination in cp-sat 2020-11-01 11:47:28 +01:00
Mizux Seiha
fa682b4907 remove deprecated examples using TreeMonitor 2020-09-19 18:04:50 +02:00
Mizux Seiha
d4d88e1f64 constraint_solver: Fix LocalSearchFilter samples 2020-08-14 14:07:58 +02:00
Corentin Le Molgat
22356ff523 Sync g3 -> gh part_2 2020-03-09 18:34:21 +01:00
Corentin Le Molgat
bbd00fcf52 Java: remove s/long long/long/ swig hack 2020-02-14 17:02:47 +01:00
Corentin Le Molgat
ff9b82d42d Java: Ignore broken methods (Fix #1276)
Usually missing typemap for return type or argument type
2020-01-17 11:21:46 +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
a33585e6aa mostly indent; internal improvements to the Routing library; change API with SearchLimit to RegularLimit 2019-04-11 09:46:06 -07:00
Laurent Perron
814935dab7 large routing update; rewrite PDP options; Fix examples of LS API after API change; minor sync on the rest of or-tools 2019-03-15 17:17:02 +01:00
Corentin Le Molgat
2f0680127d Backport from g3 to github 2019-03-13 13:51:31 +01:00
Corentin Le Molgat
63f288f48e Backport Java fixup from g3 2019-03-12 14:51:30 +01:00
Corentin Le Molgat
1304f15ef8 Java: constraint_solver.i cleanup 2019-03-06 11:01:50 +01:00
Corentin Le Molgat
e404b36d9d Java: %ignore wrongly wrapped methods
- Removed:
* AssignmentContainer::MutableElement

* Solver::ActiveSearch
* Solver::MakeApplyBranchSelector
* Solver::SearchContext
* Solver::SetBranchSelector
* Solver::SetSearchContext

* PropagationBaseObject::ExecuteAll
* PropagationBaseObject::EnqueueAll

* LocalSearchHandler

* SearchLogParameters
  note: Nested struct not well supported in SWIG...

* UnsortedNullableRevBitset
  note: only use internally in table.cc should not be in constraint_solveri.h

* FillValues()

note: They are not wrapped in Python BTW

- Add missing #undef
2019-03-04 00:05:12 +01:00
Corentin Le Molgat
b6b42f122c Java: fix support for int64*[const] argument 2019-03-04 00:05:12 +01:00
Corentin Le Molgat
803cca09f6 Java: Fix cast in IntIntToLongFunction() 2019-03-04 00:05:12 +01:00
Corentin Le Molgat
633bdfa4f4 Java: Add LongToIntFunction for PathOperator 2019-03-04 00:05:12 +01:00
Corentin Le Molgat
2878edbb95 Java: removed typedef in constraint_solver.i
- Already in base/base.i
2019-03-04 00:05:12 +01:00
Corentin Le Molgat
3af499493e Fix windows routing callback 2019-02-26 09:50:15 +01:00
Corentin Le Molgat
fc1a12e85a Export g3 to github 2019-02-18 15:44:06 +01:00
Corentin Le Molgat
18d21667e1 Sync java SWIG with g3 2019-02-12 17:16:25 +01:00
Corentin Le Molgat
807ce59344 Fixup Java constraint solver. 2019-02-12 11:06:27 +01:00
Corentin Le Molgat
d054c53c74 Java: Use lambda in Constraint Solver 2019-02-12 11:06:27 +01:00
Corentin Le Molgat
fbc6f4c4da Java/.NET: prefix AssignmentContainer template typedef by Assignment 2019-01-16 13:46:32 +01:00
Corentin Le Molgat
404e9aed3d Fix naming for Java Swig PathOperator protected methods 2019-01-16 13:36:50 +01:00
Corentin Le Molgat
3204c5ab93 Fix Java camelCase for CP methods
cd ortools/gen/com/google/ortools/constraintsolver
for i in *.java; do
 i=${i%.java};
 echo "$i.java:";
 sed -e "s/[ ]*public .* \([A-Z][a-zA-Z]*\)(.*$/%rename (\1) operations_research::$i::\1;/;t;d" $i.java | sort -u;
 echo "";
done
2019-01-15 17:29:55 +01:00
Laurent Perron
75876db069 Merge branch 'master' of github.com:google/or-tools 2018-12-18 16:23:48 +01:00
Laurent Perron
1d04b1738d move routing code around; cleanup examples 2018-12-18 15:45:34 +01:00
Corentin Le Molgat
2898165bce Java: rename AssignmentContainer::MutableElement to mutableElement 2018-12-18 14:40:45 +01:00
Corentin Le Molgat
77579d5faa java: Add all AssignmentContainer template intantiation 2018-12-18 14:40:45 +01:00
Laurent Perron
887b150207 generalize java vector.i 2018-12-13 15:19:30 +01:00
Laurent Perron
65ba1eb837 move java swig vector code to util/java/vector.i 2018-12-13 15:08:33 +01:00
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
a60c3291cd java support int64 -> int64_t 2018-12-10 13:35:51 +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
Jeremy Apthorp
373b27c240 Make DecisionVisitor a director type in Java bindings
This allows inspecting Decision objects from SearchMonitor callbacks in Java.
2018-08-03 21:39:36 -07:00
Laurent Perron
10db4c7cd0 minor changes 2017-12-14 12:45:54 +01: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