Commit Graph

119 Commits

Author SHA1 Message Date
Corentin Le Molgat
c3a2c123b5 Add VrpPickupDelivery.java 2019-01-10 16:03:34 +01:00
Corentin Le Molgat
38c03c4df6 Add Java samples 2019-01-09 11:30:30 +01:00
Corentin Le Molgat
64efcc13e3 Add VrpCapacity.java 2019-01-07 17:23:21 +01:00
Corentin Le Molgat
96051d559c Add SimpleRoutingProgram.java 2018-12-28 16:02:21 +01:00
Corentin Le Molgat
5a4ab80646 Move Tsp.java & Vrp.java to cp/samples 2018-12-27 11:02:35 +01:00
Laurent Perron
0d892e24bf add missing SWIG_INC to java swig invocations 2018-12-10 14:01:20 +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
Corentin Le Molgat
0f7551551f Add Samples from g3 2018-11-27 08:20:58 +01:00
Corentin Le Molgat
7e47d2dae5 Add SimpleMipProgram from g3 2018-11-22 09:47:20 +01:00
Corentin Le Molgat
97044de369 Makefile: Add samples rules for algorithm and graph 2018-11-16 15:10:15 +01:00
Laurent Perron
c75045897b merge simple_solve_sample_sat into simple_sat_program; update doc 2018-11-16 05:02:48 -08:00
Laurent Perron
8fd62c9e43 reorganize all sat samples to have regular naming
Remove sub-method in C# sat sample, just use Main()
2018-11-15 10:56:34 -08:00
Laurent Perron
2edea4be83 add CpIsFun.java 2018-11-10 13:40:57 +01:00
Corentin Le Molgat
2e5e79cdc7 Add linear_solver/samples/SimpleLPProgram 2018-11-09 12:53:46 +01:00
Laurent Perron
48d4fe2b89 fix makefiles after contrib example 2018-11-07 21:31:58 +01:00
Corentin Le Molgat
8eeadbecce Add SimpleProgram
This is the example use in optimization site:
GUIDES/Introduction/GetStarted/<lang>/RunningProgram
2018-11-06 14:36:21 +01:00
Corentin Le Molgat
c18421ab44 Makefile: Add build/run target
- Add build/run target to archive Makefile
- Be able to run cc/python/java/dotnet examples in //
2018-10-31 08:33:43 +01:00
Corentin Le Molgat
96de4ec227 Java: Create target test_java_tests for UT 2018-09-18 10:30:36 +02:00
Corentin Le Molgat
b3701b1b9f makefile: Fix JA*_BIN path 2018-09-17 12:00:59 +02:00
Corentin Le Molgat
b10b2e92a4 Maintenance: update Makefile.java.mk
- Add quotes guards to protect from space in path
2018-09-10 14:26:25 +02:00
Corentin Le Molgat
836ecba6bd java: Remove $(JAR)
- now test_java depends on rjava_% which generate the same list
2018-09-04 10:07:32 +02:00
Corentin Le Molgat
a1fdabf3b1 Makefile: remove redundant ortoolslibs target
- prefere to use `cc` phony target or $(OR_TOOLS_LIBS) file
2018-09-04 10:07:32 +02:00
Laurent Perron
b3743f4cff Fix #40 + test 2018-09-02 09:24:24 +02:00
Corentin Le Molgat
6d9fae0be4 java: Makefile cleanup 2018-08-31 18:23:08 +02:00
Corentin Le Molgat
c8643fc456 java: rework examples target 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
Laurent Perron
caca08f3f1 tentative fix for java sat 2018-08-01 22:25:32 -07:00
Laurent Perron
39fa9a6d61 minimal java sat sample implemented 2018-08-01 15:29:10 -07:00
Laurent Perron
5e2a5d1d86 stub code to get sat/java interface 2018-08-01 14:10:19 -07:00
Corentin Le Molgat
cb3972c6db java: use J for .jar extension 2018-07-17 15:03:10 +02:00
Corentin Le Molgat
13a566bed4 Move java examples 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
4f24443b17 Move windows tools to tools/win 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
b32dafacc6 Makefile: cc java python dotnet become idempotent
- Remove implicit rules
- Fix python obj/swig deps
- Keep intermediate file and dir
- remove MISSING_BUILD_DIRECTORIES
- Use GEN_DIR and GEN_PATH
- Remove GMake SUFFIXES
2018-07-03 22:27:35 +02:00
Corentin Le Molgat
6cd8da56ce [CPP] Rework cc to use dynamic dependencies
libortools:
- Rename LD_FLAGS to LDFLAGS
- Update LDFLAGS
- Add install_name to LDFLAGS on MacOS
- use OR_TOOLS_LIBS as target name

libraries:
- Rename OR_TOOLS_LD_FLAGS to OR_TOOLS_LDFLAGS
- Add OR_TOOLS_LNK and OR_TOOLS_LDFLAGS
- add install_name on MacOS

Misc:
- Rework LINK_FLAGS
- Replace ortools$Sgen by $(GEN_DIR)
- Fix install_cc rules
- Update detect_cc target
2018-05-28 08:08:49 +02:00
Corentin Le Molgat
02877e28f1 [UNIX][DEPS] Build dependencies as dynamic libs
Unix:
- Rename install_directories rule
  this target creates dependencies/install dir not ortools install dir
- replace $(LIB_SUFFIX) by $L to be consistent with $E and $O suffix
- fix rpath, no need anymore patchelf
  -> remove prerequisite $(PATCHELF) in install_cc
- use build_cmake as build directory
  note: MacOS is case insensitive when creating directory
  and bazel file is named BUILD -> `mkdir build` won't work
- Fix CMD_LNK on mac
- Fix MacOS LINK_FLAGS
- MacOS also use LIB_DIR = lib

Win:
- Fix windows lib suffix $L

Protobuf:
- Need to use PROTOC (like MONO) to add LD_LIBRARY_PATH hack
  -> PROTOC = LD_LIBARY_PATH="..." protoc
  -> replace $(PROTOBUF_DIR)/bin/protoc by $(PROTOC)
- Remove uneeded PROTOBUF_DIR defs
- Apply patch to protobuf to use @rpath on MacOS
- Add rpath to protobuf install rules

Coin-OR
- Use coin-or github repos mirror instead of the svn repo (Fix #379)
- Use the splited Cbc (CoinUtils, Osi, Clp, Cgl, Cbc)
note: usually distro use this layout cf https://repology.org/metapackage/coin-or-cbc/badges
- Fix rpath for all coin-or libraries at post-install using patchelf (linux) or otools (osx)
2018-05-28 08:08:49 +02:00
Corentin Le Molgat
b96703d0ce Use JAVA_HOME instead of JDK_DIRECTORY (#614) 2018-03-08 09:52:29 +01:00
Corentin Le Molgat
11a22957a4 Fix echo blankline on windows 2018-03-06 15:03:40 +01:00
Corentin Le Molgat
9b41cae639 Update detect_* targets 2018-03-06 14:34:41 +01:00
Corentin Le Molgat
6eff7e4476 Add newline at end of each help_* targets 2018-03-06 14:23:47 +01:00
Laurent Perron
a4f4c2d5a6 move check_third_party into ortoolslib target; avoid rebuilding C# all the time 2018-03-06 11:42:06 +01:00
Corentin Le Molgat
c53de553d6 Add JNIFLAGS to detect_java 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
51b56430f5 Rework Makefile help 2018-03-05 09:17:28 +01:00
Corentin Le Molgat
2bd7f9d1bb Fix help_XXX target on Windows 2018-02-28 15:20:56 +01:00
Corentin Le Molgat
671cf273b1 Rework Java Makefile 2018-02-28 15:14:48 +01:00
Corentin Le Molgat
707a8789bf rework Makefile 'detect' target 2017-12-01 15:30:47 +01:00
Corentin Le Molgat
d824ed88ce Fix JAVA variables 2017-11-24 15:14:08 +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
Laurent Perron
c9b8b7b3e6 Fix routing deps 2017-04-09 21:56:47 +02:00
Driss Lahlou
1653ebc168 fix in java dependencies 2017-01-11 19:12:16 +01:00