Commit Graph

60 Commits

Author SHA1 Message Date
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
e04edbe7ef Remove subcluster cuts 2015-03-26 07:39:58 -04:00
55c4485137 Fix cut edges mapping and cluster node activation 2015-03-26 07:37:05 -04:00
64351aae34 Unify add_cut; organize functions 2015-03-25 16:59:14 -04:00
882739c378 Extract two other subtour separation methods and cut edges mapping 2015-03-25 16:43:02 -04:00
45946b235d Extract GTSP_find_exact_subtour_elimination_cuts_1 2015-03-25 16:14:42 -04:00
2a2fd6713b Extract method to build flow digraph 2015-03-25 15:56:43 -04:00
81995ac378 Draw fractional solutions 2015-03-25 15:22:40 -04:00
4ce5ae9f33 Implement subcluster cuts 2015-03-25 15:22:26 -04:00
84db3006cd Fix labels overlapping nodes 2015-03-25 06:32:34 -04:00
8af349c106 Additional subtour cuts 2015-03-25 06:32:19 -04:00
5fe42908b4 Fix subtour cuts, create separate main functions 2015-03-24 10:00:45 -04:00
75a016c8c2 Add functions to find minimum cut from a maximum flow 2015-03-20 11:22:58 -04:00
ad71e2317e Rename Makefile.example 2015-03-20 10:05:39 -04:00
145b60f9d6 Remove IDE files 2015-03-20 10:02:27 -04:00
2da8b5db35 Remove extra file 2015-03-20 09:59:06 -04:00
91a2731d35 Implement max flow algorithm 2015-03-20 09:57:16 -04:00
42f96fd01e FIx log_debug 2015-03-20 09:56:50 -04:00
8ced1568bd New logging macros 2015-03-19 16:11:44 -04:00