always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,119 Commits 2 Branches 0 Tags
5eff2ed1bd24432c9fd577ee229b009da2c9a0ef
Commit Graph

5119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Perron
5eff2ed1bd polish sat doc and code samples 2018-05-30 11:29:09 -07:00
Laurent Perron
637efda944 fix doc 2018-05-30 11:05:00 -07:00
Laurent Perron
9a9e2e7741 more doc on sat 2018-05-30 11:02:32 -07:00
Laurent Perron
ca579c649f add code samples in C++ for sat 2018-05-30 10:03:49 -07:00
Laurent Perron
df52209c22 fix python compilation on mac with xcode supplied python 2018-05-30 06:37:34 -07:00
Laurent Perron
ede5175a45 update sat doc 2018-05-29 16:13:04 -07:00
Laurent Perron
dafbeb9ea5 update sat doc 2018-05-29 16:12:12 -07:00
Laurent Perron
1f1599c1f3 update sat doc 2018-05-29 16:11:46 -07:00
Laurent Perron
f25a18445f update sat doc 2018-05-29 16:09:20 -07:00
Laurent Perron
062513a4e1 update sat doc 2018-05-29 16:06:46 -07:00
Laurent Perron
35df0601cc update sat doc 2018-05-29 16:05:30 -07:00
Mizux
2beffa10eb Merge pull request #697 from google/mizux/shared 
Use dynamic dependencies on UNIX
 2018-05-29 14:05:13 +02:00
Corentin Le Molgat
287acc6b5d [JAVA] Refactor test_java_examples target 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
85bd99092b [PYTHON] Rework to use dynamic dependencies 
- Fix DYNAMIC_LD on MacOS
- Fixup @rpath in python wrapper
- Rework clean_python target
- Cleaning rpy target
- Echo test_python rules
- Add all *vrp* samples to test_python
- Rework pypi_archive target
  - Copy shared library to python tempDir
  - Update setup.py
- Echo install_python rules (i.e. remove of @)
- Add uninstall_python target
- Update detect_python target
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
ff6d262617 [PYTHON] Rework PYTHON_INC and PYTHON_LNK 2018-05-28 08:08:49 +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
6b36617506 Makefile: Fix $S -> / in prerequisite 
$S is for Makefile shell cmd not target or prerequisite syntax.
i.e. always use / in path.
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
571fed405c Windows Makefile: generate Makefile.local before building third party 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
51418e59f4 Windows move macro WINDOWS_*_DIRS 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
0c2e38df6b Makefile: remove CD def 
cd is available on all platform -> no need for a CD def
 2018-05-28 08:08:49 +02:00
Corentin Le Molgat
fe89f01c0d Add comment to OBJ_OUT and EXE_OUT 
- useful when grepping these defs
 2018-05-28 08:08:49 +02:00
Laurent Perron
eb8a9d45f8 [SAT] fix bug in lp scaling 2018-05-26 00:03:08 +02:00
Corentin Le Molgat
fa81b14e7c Fix Travis-CI fsharp on MacOS (Fix #701) 2018-05-25 17:45:26 +02:00
Corentin Le Molgat
6110b5ad72 fsharp: update error message when dotnet not found 2018-05-25 16:51:19 +02:00
Corentin Le Molgat
c460216aa8 Revert "Travis-CI: Disable fsharp_test until fix is found (#701)" 
This reverts commit b0f76a59ab.
 2018-05-25 15:10:30 +02:00
Corentin Le Molgat
2cffc9f1af Revert "Travis-CI: Disable fsharp target on osx until fix is found (#701)" 
This reverts commit 7f57f2368a.
 2018-05-25 15:10:14 +02:00
Corentin Le Molgat
8c303ccac0 Fix FSharp project 2018-05-25 15:10:06 +02:00
Corentin Le Molgat
97401ea17a Update C# and F# compiler management 2018-05-25 15:09:58 +02:00
Corentin Le Molgat
7f57f2368a Travis-CI: Disable fsharp target on osx until fix is found (#701) 2018-05-25 14:38:06 +02:00
Laurent Perron
ae1fb25df8 Merge branch 'master' of https://github.com/google/or-tools 2018-05-25 14:05:28 +02:00
Laurent Perron
e3fd57eb51 [SAT] check intermediate solution in debug mode, check solutions when presolve is off 2018-05-25 14:05:09 +02:00
Corentin Le Molgat
b0f76a59ab Travis-CI: Disable fsharp_test until fix is found (#701) 2018-05-25 11:27:12 +02:00
Laurent Perron
4c1dc11cab fix bug in reservoir checker [SAT] 2018-05-25 11:15:15 +02:00
Laurent Perron
225e819021 update sat doc 2018-05-24 15:57:39 +02:00
Laurent Perron
0928823b60 update sat doc 2018-05-24 15:50:40 +02:00
Laurent Perron
ee7eaabfd4 update sat doc 2018-05-24 14:38:31 +02:00
Laurent Perron
50d918243e update sat doc 2018-05-24 14:30:14 +02:00
Laurent Perron
54c0fd2da0 code cleanup 2018-05-24 13:12:32 +02:00
Laurent Perron
be0c217682 continue working on sat cookbook 2018-05-24 13:11:49 +02:00
Laurent Perron
41c1ae1c15 speed up the disjunctive constraint in SAT 2018-05-22 17:13:52 +02:00
Laurent Perron
81cd0b4b13 add readme file to the sat directory 2018-05-22 15:51:08 +02:00
Laurent Perron
a6ec503faf initial set of recipes for the SAT solver 2018-05-22 15:07:11 +02:00
Laurent Perron
bd106059e5 support assembly scheduling in the jobshop_scheduling.proto and corresponding examples/cpp/jobshop_sat.cc 2018-05-22 13:13:52 +02:00
Laurent Perron
3e401080f9 [SAT] preprocess tasks with 0-1 demands in cumulative as optional tasks; fix scheduling code with optional intervals 2018-05-18 13:45:49 +02:00
Laurent Perron
0bb452d5a5 Merge branch 'master' of https://github.com/google/or-tools 2018-05-16 13:43:34 +02:00
Laurent Perron
9402f58d1d change sat internal API; stop ignoring random seed in glop 2018-05-16 13:43:29 +02:00
lperron
b94955867c Merge pull request #680 from alanbato/patch-1 
Fix comments of the SequenceVar Rank functions
 2018-05-16 11:48:37 +02:00
Laurent Perron
cb1fc93b94 fix wedding_optimal_chart_sat.py 2018-05-15 14:04:53 +02:00
Laurent Perron
798fa68a73 remove bad character 2018-05-15 13:57:28 +02:00