gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Better test files for Preflow (#176) - Slightly improve preflow_test.cc. - Change preflow_test.lgf to meet the new LGF format and remove trailing tabs.
0 2 0
default
2 files changed with 41 insertions and 34 deletions:
↑ Collapse diff ↑
Ignore white space 24 line context
1 1
@nodes
2
label	
3
0	
4
1	
5
2	
6
3	
7
4	
8
5	
9
6	
10
7	
11
8	
12
9	
13
@edges
14
		label	capacity	
15
0	1	0	20	
16
0	2	1	0	
17
1	1	2	3	
18
1	2	3	8	
19
1	3	4	8	
20
2	5	5	5	
21
3	2	6	5	
22
3	5	7	5	
23
3	6	8	5	
24
4	3	9	3	
25
5	7	10	3	
26
5	6	11	10	
27
5	8	12	10	
28
6	8	13	8	
29
8	9	14	20	
30
8	1	15	5	
31
9	5	16	5	
32
@attributes 
2
label
3
0
4
1
5
2
6
3
7
4
8
5
9
6
10
7
11
8
12
9
13
@arcs
14
		label	capacity
15
0	1	0	20
16
0	2	1	0
17
1	1	2	3
18
1	2	3	8
19
1	3	4	8
20
2	5	5	5
21
3	2	6	5
22
3	5	7	5
23
3	6	8	5
24
4	3	9	3
25
5	7	10	3
26
5	6	11	10
27
5	8	12	10
28
6	8	13	8
29
8	9	14	20
30
8	1	15	5
31
9	5	16	5
32
@attributes
33 33
source 1
34 34
target 8
35
@end
Ignore white space 24 line context
... ...
@@ -16,46 +16,54 @@
16 16
 *
17 17
 */
18 18

	
19 19
#include <fstream>
20 20
#include <string>
21 21

	
22 22
#include "test_tools.h"
23 23
#include <lemon/smart_graph.h>
24 24
#include <lemon/preflow.h>
25 25
#include <lemon/concepts/digraph.h>
26 26
#include <lemon/concepts/maps.h>
27 27
#include <lemon/lgf_reader.h>
28
#include <lemon/elevator.h>
28 29

	
29 30
using namespace lemon;
30 31

	
31
void checkPreflow()
32
void checkPreflowCompile()
32 33
{
33 34
  typedef int VType;
34 35
  typedef concepts::Digraph Digraph;
35 36

	
36 37
  typedef Digraph::Node Node;
37 38
  typedef Digraph::Arc Arc;
38 39
  typedef concepts::ReadMap<Arc,VType> CapMap;
39 40
  typedef concepts::ReadWriteMap<Arc,VType> FlowMap;
40 41
  typedef concepts::WriteMap<Node,bool> CutMap;
41 42

	
43
  typedef Elevator<Digraph, Digraph::Node> Elev;
44
  typedef LinkedElevator<Digraph, Digraph::Node> LinkedElev;
45

	
42 46
  Digraph g;
43 47
  Node n;
44 48
  Arc e;
45 49
  CapMap cap;
46 50
  FlowMap flow;
47 51
  CutMap cut;
48 52

	
49
  Preflow<Digraph, CapMap>::SetFlowMap<FlowMap>::Create preflow_test(g,cap,n,n);
53
  Preflow<Digraph, CapMap>
54
    ::SetFlowMap<FlowMap>
55
    ::SetElevator<Elev>
56
    ::SetStandardElevator<LinkedElev>
57
    ::Create preflow_test(g,cap,n,n);
50 58

	
51 59
  preflow_test.capacityMap(cap);
52 60
  flow = preflow_test.flowMap();
53 61
  preflow_test.flowMap(flow);
54 62
  preflow_test.source(n);
55 63
  preflow_test.target(n);
56 64

	
57 65
  preflow_test.init();
58 66
  preflow_test.init(cap);
59 67
  preflow_test.startFirstPhase();
60 68
  preflow_test.startSecondPhase();
61 69
  preflow_test.run();
0 comments (0 inline)