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

316 Commits

Author SHA1 Message Date
Corentin Le Molgat
ac42c57a8e Update stigler_diet example (C++, Python) 2018-10-15 10:10:06 +02:00
Corentin Le Molgat
e786ca8b3d Cleanup Makefile.cpp.mk 2018-10-15 10:09:13 +02:00
Corentin Le Molgat
7e3b834476 Add nurses_cp.cc and job_shop_cp.cc 2018-10-02 10:10:53 +02:00
Corentin Le Molgat
fec7747583 Cpp: disable pdptw 2018-09-27 10:51:15 +02:00
Corentin Le Molgat
a06a25e891 Cleaning Makefile.cpp.mk 2018-09-27 10:38:29 +02:00
Corentin Le Molgat
53afbc0c88 cpp: remove ccexe variables 
Now test_cc run "all" examples so we don't need it anymore
 2018-09-27 10:37:23 +02:00
Laurent Perron
af27df74b4 tentative fix for appveyor 2018-09-26 23:12:36 +02:00
Corentin Le Molgat
0241e6d74e Makefile: Force pb.h files to be build first ! 2018-09-26 17:12:36 +02:00
Corentin Le Molgat
afe2833b31 Add missing *_DEPS prerequisite to $(OBJ_DIR)/%.$O 2018-09-26 13:43:21 +02:00
Corentin Le Molgat
027f5cc3f8 Add missing basic examples 
C++:
 - [Up] linear_programming
 - [Up] integer_programming
 - constraint_programming_CP / rabbits_pheasants_cp
 - knapsack
 - max_flow / min_cost_flow
 - tsp / vrp
note: previous "fuzzy" tsp has been renamed random_tsp.

.Net:
 - vrp
 2018-09-26 13:15:34 +02:00
Laurent Perron
eb07d1593f tentative fix appveyor test_cc_examples 2018-09-26 08:09:17 +02:00
Laurent Perron
56d6af52bc fix make test_cc_examples 2018-09-25 10:28:17 +02:00
Laurent Perron
dc873e59cd fix more examples 2018-09-25 09:10:34 +02:00
Laurent Perron
3c79f0c9c6 fix more examples 2018-09-25 09:08:18 +02:00
Laurent Perron
14df722c1d Merge branch 'master' of https://github.com/google/or-tools 2018-09-25 08:51:38 +02:00
Laurent Perron
d93d85b463 fix flexible_jobshop example and test 2018-09-25 08:51:19 +02:00
Corentin Le Molgat
08439dd579 Fix wrong rpath on fap lib on macOS 2018-09-25 08:24:12 +02:00
Laurent Perron
bbbe8b1fd4 reenable dimacs problem 2018-09-25 08:10:36 +02:00
Laurent Perron
2091e3ffce second fix on dimacs file, now runs. Remove from tests as we have no data file 2018-09-24 23:47:57 +02:00
Laurent Perron
2eecedf328 fix wrong rpath on dimacs lib on mac os X 2018-09-24 23:43:53 +02:00
Laurent Perron
4b272939ad incomplete fix dimacs example 2018-09-24 21:48:41 +02:00
Corentin Le Molgat
38fca8f5a4 Update CC example list 2018-09-24 17:37:51 +02:00
Corentin Le Molgat
4bb95a8193 Rework *EX_DIR/*EX_PATH macro 2018-09-18 10:10:25 +02:00
Laurent Perron
6d2267697b remove rcpsp_sat cpp example 2018-09-12 19:50:26 +02:00
Corentin Le Molgat
72a0f3f8ee Update to SCIP 6.0 
Unix:
- Use of make based install of scip
Windows:
- Use of cmake based install/installer of scip
- Need to copy scip.dll in BIN_DIR
 2018-09-06 12:02:21 +02:00
Corentin Le Molgat
60aca4edc4 Makefile: fixup dependencies on phony target third_party_check 
- make cc twice do nothing as expected (and all targets which depends on it)
 2018-09-06 12:02:20 +02:00
Corentin Le Molgat
cd3f8748d1 cc: Fix clean_cc 
- Add samples binaries to `clean_cc` target
 2018-09-06 12:02:20 +02:00
Corentin Le Molgat
8608266f18 Makefile: fix flatzinc rule on windows 2018-09-06 12:02:20 +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
Corentin Le Molgat
5a18b2be59 cc: don't compile all test in cc target 
- remove dependencies to `ccexe`
- Add `ccexe` to `test_cc` to compile them all
 2018-09-04 10:07:31 +02:00
Corentin Le Molgat
e4bf44b9fb cc: fix make test_cc 2018-09-03 11:28:13 +02:00
Corentin Le Molgat
6837decccc cpp: Makefile cleanup 2018-08-31 18:23:08 +02:00
Corentin Le Molgat
304cec3258 Makefile: Fix redefinition of symbols on windows 2018-08-07 16:18:00 +02:00
Corentin Le Molgat
bc9777418f Makefile: Rework Windows Third Party management 
- Should fix most of the space in the path issue
  - try to use relative path as much as possible
- follow the same layout than unix third party
 2018-08-07 16:17:59 +02:00
Corentin Le Molgat
d6a6f8b5d2 archive: fix typo 2018-07-24 10:55:29 +02:00
Corentin Le Molgat
09b4af2b91 archive: Fix protobuf recursive copy 
need to use "xcopy source destination /E"
 2018-07-24 10:35:21 +02:00
Corentin Le Molgat
ec6c281d94 archive: Fix windows includes xcopy 
- need to specify (and create) the output directory
e.g. to recursively copy directory 'foo' in 'tmp'
unix: cp -r foo tmp
win: md tmp\\foo & xcopy foo tmp\\foo
 2018-07-24 10:17:39 +02:00
Corentin Le Molgat
665b3ddb07 cpp: Fix windows install, copy third party include 2018-07-24 08:39:57 +02:00
Corentin Le Molgat
e737b10a9a archive: Fix Fz archive 2018-07-13 15:23:12 +02:00
Corentin Le Molgat
7f453a0475 archive: unix: Check if protobuf is in lib or lib64 2018-07-13 15:23:11 +02:00
Corentin Le Molgat
5d8c4f0cb1 archive: Add ortools/data/*.h to archive 
- needed by jobshop_sat
 2018-07-13 14:40:18 +02:00
Corentin Le Molgat
9536db9a98 cc: Fix examples/tests/*.cc 
- Add them to test_cc
  except issue173.cc which takes few dozen of seconds
 2018-07-13 08:55:40 +02:00
Corentin Le Molgat
59db6cb2d8 cpp: Cleaning cpp rules 
- Use pattern rules
- Remove dead code (CP_BINARIES and LP_BINARIES doesn't exist anymore)
- Expose fz and test_fz in help_cc
- Relayout makefile.cc.mk
- Move CVRP Problem rule before generic ones (needed for make < 4.0)
 2018-07-13 08:55:40 +02:00
Corentin Le Molgat
ef5a2a2775 Archive: Rework cc/java/dotnet (Fix #723) 
- Rename [Makefile|Readme].cc.java.dotnet
- Add missing dynamic lib on unix archive (Fix #723)
- Add rpah to lib64 for centos
- Use CXX, CXXFLAGS and LDFLAGS
  src: https://www.gnu.org/software/make/manual/make.html#Catalogue-of-Rules
- Add which.exe to archive on windows
- Add test_archive to .PHONY
- Add detect_archive
 2018-07-10 15:45:04 +02:00
Corentin Le Molgat
6485017458 cc: Fix missing port/*.h in install_cc 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
ca6e697788 cc: use MKDIR_P to create the install_cc root dir 2018-07-10 11:16:20 +02:00
Corentin Le Molgat
3085fcbf81 cpp: add FLATZINC_PATH 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
f5f176d496 cpp: Add library path variable 2018-07-05 14:56:04 +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