Commit Graph

78 Commits

Author SHA1 Message Date
91769fc7db Add copyright notice 2015-04-04 09:29:43 -04:00
706e35f8d7 Delete unused script 2015-04-04 08:45:53 -04:00
44ff7125eb Delete old TSP files 2015-04-04 08:45:42 -04:00
e2c6dafb33 Refactoring 2015-04-04 08:45:26 -04:00
f2b788665f Improve draw-solution.sage 2015-04-04 08:44:57 -04:00
11ae7b1ce1 Delete benchmark.sh 2015-04-04 07:00:54 -04:00
ff006a9eec Update .gitignore and remove extra files from tree 2015-04-04 07:00:29 -04:00
92b04d40b5 Change executable name 2015-04-04 06:59:16 -04:00
2bc1b897bb Refactoring; remove unused code 2015-04-04 06:57:34 -04:00
b802256426 Simplify LP; remove useless cutting planes 2015-04-04 05:42:05 -04:00
1711695e19 Implement time limit 2015-04-01 07:26:54 -04:00
Armin_Sadeghi
f5e15f1385 Heuristics included 2015-04-01 04:17:13 -04:00
7a65894692 Write statistics to file 2015-03-31 16:07:05 -04:00
6fb6e626aa Even combs 2015-03-31 14:19:26 -04:00
f04d9a1d60 Cut pool compression 2015-03-31 14:19:11 -04:00
ebc26bd5ad Move parameters to params.h 2015-03-31 14:19:00 -04:00
fd0b37bdf9 Pass reference to BNC on solution_found 2015-03-31 11:54:15 -04:00
79798c4dc3 Bugfix 2015-03-31 11:50:19 -04:00
07c14a33ab Fix double free 2015-03-31 07:48:01 -04:00
0ea3efa9c5 Check initial solution 2015-03-31 07:37:52 -04:00
2c92355e93 Remove memory leaks 2015-03-31 07:01:58 -04:00
8051b1afcf Unify code style and rename some variables 2015-03-31 06:20:55 -04:00
5d4a6649aa Merge branch 'gtsp-comb' 2015-03-31 05:39:32 -04:00
1208297971 Merge branch 'gtsp-comb' 2015-03-31 05:32:43 -04:00
bb3bca9498 Disable lifting; other minor changes 2015-03-31 05:14:31 -04:00
Armin_Sadeghi
b628182d2e added to the branch 2015-03-30 23:36:47 -04:00
Armin_Sadeghi
b002ab320d added to the branch 2015-03-30 23:35:50 -04:00
Armin_Sadeghi
5d3f16a401 heuristics improved slightly 2015-03-30 23:23:58 -04:00
9c3701037f Accept number of clusters; output to tmp/ 2015-03-30 17:00:27 -04:00
d726fd34b4 Print number of cuts added, even if zero 2015-03-30 16:59:57 -04:00
9398a8d9ce Check return value of user function 2015-03-30 16:59:09 -04:00
11ed52191a Remove warnings 2015-03-30 16:58:46 -04:00
745f6f755c Fix read_solution and implement solution checker 2015-03-30 16:58:26 -04:00
b01b3fe31c DEBUG level by default, and no combs 2015-03-30 16:57:48 -04:00
108b41997a Formatted abort_if 2015-03-30 16:57:19 -04:00
f8943fb1ec Bugfix. Rows not in cplex should have index -1 2015-03-30 16:56:58 -04:00
2e370e39ef Armin's heuristics 2015-03-30 16:27:13 -04:00
188367e189 Create output directory 2015-03-30 11:44:24 -04:00
f82002aa11 Implement comb cuts separation 2015-03-30 11:43:40 -04:00
ce206f5b7a Remove cuts according to age 2015-03-27 23:16:27 -04:00
cb580892b9 Implement simple cut pool; avoid duplicate cuts 2015-03-27 19:35:00 -04:00
66b3eef3a4 Run multiple rounds with decreasing cut violation; remove slack constraints 2015-03-27 18:30:43 -04:00
480aae2bd5 Rudimentary benchmark scripts 2015-03-27 10:24:06 -04:00
1c258caa7f Highlight integer edges 2015-03-26 18:21:37 -04:00
6e4d69e289 Split gtsp.c 2015-03-26 18:21:28 -04:00
461aa31475 Hide node labels for large graphs 2015-03-26 15:05:48 -04:00
554dd639e5 Reduce number of edges of the flow digraph 2015-03-26 15:05:26 -04:00
c0d50a53e2 Implement pause function 2015-03-26 15:05:03 -04:00
6e4bcdf4a3 Default number of clusters 2015-03-26 13:31:25 -04:00
2ca92fa2dc Remove warnings and dead code 2015-03-26 08:35:16 -04:00