Applied the changes which somehow vanished during my last merge. Thanks goes
to Marci for noticing this. In detail:
- added amsmath and amssymb latex packages for latex documentation
- src/demo is also scanned for doxygen input files
3 marci@karp:~/etik-ol/src/demo/marci/experiment$ ./edmonds_karp_demo < ../flow-1.dim
4 edmonds karp demo (physical blocking flow augmentation)...
5 elapsed time: u: 1.11s, s: 0.02s, cu: 0s, cs: 0s, real: 1.23456s
6 edmonds karp demo (physical blocking flow 1 augmentation)...
7 elapsed time: u: 0.78s, s: 0s, cu: 0s, cs: 0s, real: 0.851246s
8 edmonds karp demo (on-the-fly blocking flow augmentation)...
9 elapsed time: u: 1.02s, s: 0s, cu: 0s, cs: 0s, real: 1.12829s
10 edmonds karp demo (on-the-fly shortest path augmentation)...
11 elapsed time: u: 76.09s, s: 0.77s, cu: 0s, cs: 0s, real: 127.892s
13 marci@karp:~/etik-ol/src/demo/marci/experiment$ ./edmonds_karp_demo_1 < ../flow-1.dim
14 edmonds karp demo (physical blocking flow augmentation)...
15 elapsed time: u: 1.04s, s: 0.01s, cu: 0s, cs: 0s, real: 1.1643s
16 edmonds karp demo (physical blocking flow 1 augmentation)...
17 elapsed time: u: 0.73s, s: 0s, cu: 0s, cs: 0s, real: 1.29574s
18 edmonds karp demo (on-the-fly blocking flow augmentation)...
19 elapsed time: u: 0.96s, s: 0.01s, cu: 0s, cs: 0s, real: 1.05265s
20 edmonds karp demo (on-the-fly shortest path augmentation)...
21 elapsed time: u: 72.65s, s: 0.67s, cu: 0s, cs: 0s, real: 79.8199s
23 marci@linux:~/etik-ol/src/demo/marci/experiment> ./edmonds_karp_demo < ../flow-1.dim
24 edmonds karp demo (physical blocking flow augmentation)...
25 elapsed time: u: 3.04s, s: 0.01s, cu: 0s, cs: 0s, real: 3.09736s
26 edmonds karp demo (physical blocking flow 1 augmentation)...
27 elapsed time: u: 2.22s, s: 0.02s, cu: 0s, cs: 0s, real: 2.26504s
28 edmonds karp demo (on-the-fly blocking flow augmentation)...
29 elapsed time: u: 2.88s, s: 0.01s, cu: 0s, cs: 0s, real: 3.03116s
30 edmonds karp demo (on-the-fly shortest path augmentation)...
31 elapsed time: u: 201.69s, s: 0.08s, cu: 0s, cs: 0s, real: 203.99s
33 marci@linux:~/etik-ol/src/demo/marci/experiment> ./edmonds_karp_demo_1 < ../flow-1.dim
34 edmonds karp demo (physical blocking flow augmentation)...
35 elapsed time: u: 3s, s: 0.04s, cu: 0s, cs: 0s, real: 3.19728s
36 edmonds karp demo (physical blocking flow 1 augmentation)...
37 elapsed time: u: 2.21s, s: 0.03s, cu: 0s, cs: 0s, real: 2.25725s
38 edmonds karp demo (on-the-fly blocking flow augmentation)...
39 elapsed time: u: 2.82s, s: 0s, cu: 0s, cs: 0s, real: 2.83294s
40 edmonds karp demo (on-the-fly shortest path augmentation)...
41 elapsed time: u: 203.39s, s: 0.07s, cu: 0s, cs: 0s, real: 204.401s
45 marci@karp:~/etik-ol/src/demo/marci/experiment$ ./edmonds_karp_demo < ../flow-1.dim
46 edmonds karp demo (physical blocking flow augmentation)...
47 elapsed time: u: 0.36s, s: 0.01s, cu: 0s, cs: 0s, real: 1.13854s
48 edmonds karp demo (physical blocking flow 1 augmentation)...
49 elapsed time: u: 0.23s, s: 0s, cu: 0s, cs: 0s, real: 0.243452s
50 edmonds karp demo (on-the-fly blocking flow augmentation)...
51 elapsed time: u: 0.32s, s: 0.01s, cu: 0s, cs: 0s, real: 0.339224s
52 edmonds karp demo (on-the-fly shortest path augmentation)...
53 elapsed time: u: 26.98s, s: 0.29s, cu: 0s, cs: 0s, real: 32.2458s
55 marci@karp:~/etik-ol/src/demo/marci/experiment$ ./edmonds_karp_demo_1 < ../flow-1.dim
56 edmonds karp demo (physical blocking flow augmentation)...
57 elapsed time: u: 0.37s, s: 0.01s, cu: 0s, cs: 0s, real: 0.402523s
58 edmonds karp demo (physical blocking flow 1 augmentation)...
59 elapsed time: u: 0.22s, s: 0s, cu: 0s, cs: 0s, real: 0.244878s
60 edmonds karp demo (on-the-fly blocking flow augmentation)...
61 elapsed time: u: 0.32s, s: 0.01s, cu: 0s, cs: 0s, real: 0.353093s
62 edmonds karp demo (on-the-fly shortest path augmentation)...
63 elapsed time: u: 27.02s, s: 0.34s, cu: 0s, cs: 0s, real: 30.0516s
65 marci@linux:~/etik-ol/src/demo/marci/experiment> ./edmonds_karp_demo < ../flow-1.dim
66 edmonds karp demo (physical blocking flow augmentation)...
67 elapsed time: u: 0.91s, s: 0.01s, cu: 0s, cs: 0s, real: 0.938415s
68 edmonds karp demo (physical blocking flow 1 augmentation)...
69 elapsed time: u: 0.61s, s: 0.01s, cu: 0s, cs: 0s, real: 0.62244s
70 edmonds karp demo (on-the-fly blocking flow augmentation)...
71 elapsed time: u: 0.88s, s: 0s, cu: 0s, cs: 0s, real: 0.914984s
72 edmonds karp demo (on-the-fly shortest path augmentation)...
73 elapsed time: u: 66.55s, s: 0.09s, cu: 0s, cs: 0s, real: 67.5525s
75 marci@linux:~/etik-ol/src/demo/marci/experiment> ./edmonds_karp_demo_1 < ../flow-1.dim
76 edmonds karp demo (physical blocking flow augmentation)...
77 elapsed time: u: 0.85s, s: 0s, cu: 0s, cs: 0s, real: 0.858786s
78 edmonds karp demo (physical blocking flow 1 augmentation)...
79 elapsed time: u: 0.58s, s: 0.03s, cu: 0s, cs: 0s, real: 0.61541s
80 edmonds karp demo (on-the-fly blocking flow augmentation)...
81 elapsed time: u: 0.85s, s: 0s, cu: 0s, cs: 0s, real: 0.85847s
82 edmonds karp demo (on-the-fly shortest path augmentation)...
83 elapsed time: u: 66.71s, s: 0.06s, cu: 0s, cs: 0s, real: 68.0292s