Commit Graph

328 Commits

Author SHA1 Message Date
Corentin Le Molgat
eee64256b3 Fix clean_cc rule 2018-11-19 11:00:44 +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
ef0b82c794 polish cp is fun python, C++, C# samples 2018-11-10 13:04:03 +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
679783dbd2 Travis-CI: build with -j4 2018-10-31 08:33:43 +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
58b018ece0 cpp: remove deprecated PROTO_DEPS 2018-10-30 16:08:19 +01:00
Corentin Le Molgat
2ccdc97d76 Remove duplicate target 2018-10-15 10:18:35 +02:00
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