gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Cleaning of heap test and bug fix in heap concept check (ticket #100) * The dijkstra heap test's digraph is inlined into the source file * The random sequences are fixed * The content of the header is moved to the source file * Only the binary heap is checked
1 4 0
default
5 files changed with 143 insertions and 220 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -178,18 +178,16 @@
178 178
	  typedef typename _Heap::Item OwnItem;
179 179
	  typedef typename _Heap::Prio OwnPrio;
180 180
	  typedef typename _Heap::State OwnState;
181 181

	
182 182
	  Item item;
183 183
	  Prio prio;
184
	  State state;
185 184
	  item=Item();
186 185
	  prio=Prio();
187 186
	  ignore_unused_variable_warning(item);
188 187
	  ignore_unused_variable_warning(prio);
189
	  ignore_unused_variable_warning(state);
190 188

	
191 189
	  OwnItem own_item;
192 190
	  OwnPrio own_prio;
193 191
	  OwnState own_state;
194 192
	  own_item=Item();
195 193
	  own_prio=Prio();
... ...
@@ -200,13 +198,15 @@
200 198
	  _Heap heap1(map);
201 199
	  _Heap heap2 = heap1;
202 200
	  ignore_unused_variable_warning(heap1);
203 201
	  ignore_unused_variable_warning(heap2);
204 202
	  
205 203
	  int s = heap.size();
204
	  ignore_unused_variable_warning(s);
206 205
	  bool e = heap.empty();
206
	  ignore_unused_variable_warning(e);
207 207

	
208 208
	  prio = heap.prio();
209 209
	  item = heap.top();
210 210
	  prio = heap[item];
211 211
	  own_prio = heap.prio();
212 212
	  own_item = heap.top();
... ...
@@ -224,20 +224,15 @@
224 224
	  heap.increase(own_item, own_prio);
225 225

	
226 226
	  heap.erase(item);
227 227
	  heap.erase(own_item);
228 228
	  heap.clear();
229 229

	
230
	  state = heap.state(item);
231
	  heap.state(item, state);
232
	  state = heap.state(own_item);
230
	  own_state = heap.state(own_item);
233 231
	  heap.state(own_item, own_state);
234 232

	
235
	  state = _Heap::PRE_HEAP;
236
	  state = _Heap::IN_HEAP;
237
	  state = _Heap::POST_HEAP;
238 233
	  own_state = _Heap::PRE_HEAP;
239 234
	  own_state = _Heap::IN_HEAP;
240 235
	  own_state = _Heap::POST_HEAP;
241 236
	}
242 237

	
243 238
	_Heap& heap;
Ignore white space 6 line context
... ...
@@ -10,12 +10,13 @@
10 10
  dijkstra_test
11 11
  dim_test
12 12
  error_test
13 13
  graph_copy_test
14 14
  graph_test
15 15
  graph_utils_test
16
  heap_test
16 17
  kruskal_test
17 18
  maps_test
18 19
  path_test
19 20
  random_test
20 21
  time_measure_test
21 22
  unionfind_test)
Ignore white space 6 line context
1 1
EXTRA_DIST += \
2 2
	test/CMakeLists.txt
3 3

	
4 4
noinst_HEADERS += \
5 5
	test/graph_test.h \
6
	test/heap_test.h \
7 6
	test/graph_maps_test.h \
8 7
        test/test_tools.h
9 8

	
10 9
check_PROGRAMS += \
11 10
	test/bfs_test \
12 11
        test/counter_test \
... ...
@@ -15,12 +14,13 @@
15 14
	test/dijkstra_test \
16 15
        test/dim_test \
17 16
	test/error_test \
18 17
	test/graph_copy_test \
19 18
	test/graph_test \
20 19
	test/graph_utils_test \
20
	test/heap_test \
21 21
	test/kruskal_test \
22 22
        test/maps_test \
23 23
        test/random_test \
24 24
        test/path_test \
25 25
        test/test_tools_fail \
26 26
        test/test_tools_pass \
... ...
@@ -37,13 +37,13 @@
37 37
test_dijkstra_test_SOURCES = test/dijkstra_test.cc
38 38
test_dim_test_SOURCES = test/dim_test.cc
39 39
test_error_test_SOURCES = test/error_test.cc
40 40
test_graph_copy_test_SOURCES = test/graph_copy_test.cc
41 41
test_graph_test_SOURCES = test/graph_test.cc
42 42
test_graph_utils_test_SOURCES = test/graph_utils_test.cc
43
# test_heap_test_SOURCES = test/heap_test.cc
43
test_heap_test_SOURCES = test/heap_test.cc
44 44
test_kruskal_test_SOURCES = test/kruskal_test.cc
45 45
test_maps_test_SOURCES = test/maps_test.cc
46 46
test_path_test_SOURCES = test/path_test.cc
47 47
test_random_test_SOURCES = test/random_test.cc
48 48
test_test_tools_fail_SOURCES = test/test_tools_fail.cc
49 49
test_test_tools_pass_SOURCES = test/test_tools_pass.cc
Ignore white space 6 line context
... ...
@@ -21,117 +21,167 @@
21 21
#include <string>
22 22
#include <vector>
23 23

	
24 24
#include <lemon/concept_check.h>
25 25
#include <lemon/concepts/heap.h>
26 26

	
27
#include <lemon/list_graph.h>
27
#include <lemon/smart_graph.h>
28 28

	
29
#include <lemon/digraph_reader.h>
29
#include <lemon/lgf_reader.h>
30
#include <lemon/dijkstra.h>
31
#include <lemon/maps.h>
30 32

	
31 33
#include <lemon/bin_heap.h>
32
#include <lemon/fib_heap.h>
33
#include <lemon/radix_heap.h>
34
#include <lemon/bucket_heap.h>
35 34

	
36 35
#include "test_tools.h"
37 36

	
38
#include "heap_test.h"
39

	
40
#include <lemon/time_measure.h>
41

	
42 37
using namespace lemon;
43 38
using namespace lemon::concepts;
44 39

	
40
typedef ListDigraph Digraph;
41
DIGRAPH_TYPEDEFS(Digraph);
42

	
43
char test_lgf[] = 
44
  "@nodes\n" 
45
  "label\n"	
46
  "0\n"	
47
  "1\n"	
48
  "2\n"	
49
  "3\n"	
50
  "4\n"	
51
  "5\n"	
52
  "6\n"	
53
  "7\n"	
54
  "8\n"	
55
  "9\n"	
56
  "@arcs\n" 
57
  "		label	capacity\n"	
58
  "0	5	0	94\n"	
59
  "3	9	1	11\n"	
60
  "8	7	2	83\n"	
61
  "1	2	3	94\n"	
62
  "5	7	4	35\n"	
63
  "7	4	5	84\n"	
64
  "9	5	6	38\n"	
65
  "0	4	7	96\n"	
66
  "6	7	8	6\n"	
67
  "3	1	9	27\n"	
68
  "5	2	10	77\n"	
69
  "5	6	11	69\n"	
70
  "6	5	12	41\n"	
71
  "4	6	13	70\n"	
72
  "3	2	14	45\n"	
73
  "7	9	15	93\n"	
74
  "5	9	16	50\n"	
75
  "9	0	17	94\n"	
76
  "9	6	18	67\n"	
77
  "0	9	19	86\n"	
78
  "@attributes\n" 
79
  "source 3\n";
80

	
81
int test_seq[] = { 2, 28, 19, 27, 33, 25, 13, 41, 10, 26,  1,  9,  4, 34};
82
int test_inc[] = {20, 28, 34, 16,  0, 46, 44,  0, 42, 32, 14,  8,  6, 37};
83

	
84
int test_len = sizeof(test_seq) / sizeof(test_seq[0]);
85

	
86
template <typename Heap>
87
void heapSortTest() {
88
  RangeMap<int> map(test_len, -1);
89

	
90
  Heap heap(map);
91
  
92
  std::vector<int> v(test_len);
93

	
94
  for (int i = 0; i < test_len; ++i) {
95
    v[i] = test_seq[i];
96
    heap.push(i, v[i]);
97
  }
98
  std::sort(v.begin(), v.end());
99
  for (int i = 0; i < test_len; ++i) {
100
    check(v[i] == heap.prio() ,"Wrong order in heap sort.");
101
    heap.pop();
102
  }
103
}
104

	
105
template <typename Heap>
106
void heapIncreaseTest() {
107
  RangeMap<int> map(test_len, -1);
108

	
109
  Heap heap(map);
110
  
111
  std::vector<int> v(test_len);
112

	
113
  for (int i = 0; i < test_len; ++i) {
114
    v[i] = test_seq[i];
115
    heap.push(i, v[i]);
116
  }
117
  for (int i = 0; i < test_len; ++i) {
118
    v[i] += test_inc[i];
119
    heap.increase(i, v[i]);
120
  }
121
  std::sort(v.begin(), v.end());
122
  for (int i = 0; i < test_len; ++i) {
123
    check(v[i] == heap.prio() ,"Wrong order in heap increase test.");
124
    heap.pop();
125
  }
126
}
127

	
128

	
129

	
130
template <typename Heap>
131
void dijkstraHeapTest(const Digraph& digraph, const IntArcMap& length, 
132
		      Node source) {
133
  
134
  typename Dijkstra<Digraph, IntArcMap>::template DefStandardHeap<Heap>::
135
    Create dijkstra(digraph, length);
136

	
137
  dijkstra.run(source);
138

	
139
  for(ArcIt a(digraph); a != INVALID; ++a) {
140
    Node s = digraph.source(a); 
141
    Node t = digraph.target(a);
142
    if (dijkstra.reached(s)) {
143
      check( dijkstra.dist(t) - dijkstra.dist(s) <= length[a],
144
      	     "Error in a shortest path tree!");
145
    }
146
  }
147

	
148
  for(NodeIt n(digraph); n != INVALID; ++n) {
149
    if ( dijkstra.reached(n) && dijkstra.predArc(n) != INVALID ) {
150
      Arc a = dijkstra.predArc(n);
151
      Node s = digraph.source(a);
152
      check( dijkstra.dist(n) - dijkstra.dist(s) == length[a],
153
	     "Error in a shortest path tree!");
154
    }
155
  }
156

	
157
}
158

	
45 159
int main() {
46 160

	
47 161
  typedef int Item;
48 162
  typedef int Prio;
49
  typedef IntIntMap ItemIntMap;
163
  typedef RangeMap<int> ItemIntMap;
164
  
165
  Digraph digraph;
166
  IntArcMap length(digraph);
167
  Node source;
50 168

	
51
  typedef ListDigraph Digraph;
52

	
53
  typedef Digraph::Arc Arc;
54
  typedef Digraph::Node Node;
55
  typedef Digraph::ArcIt ArcIt;
56
  typedef Digraph::NodeIt NodeIt;
57
  typedef Digraph::ArcMap<int> LengthMap;
58

	
59
  Digraph digraph;
60
  LengthMap length(digraph);
61
  Node start;
62

	
63
  /// \todo create own test digraph
64

	
65
  std::string f_name;
66
  if( getenv("srcdir") )
67
    f_name = std::string(getenv("srcdir"));
68
  else f_name = ".";
69
  f_name += "/test/dijkstra_test.lgf";
70
  
71
  std::ifstream input(f_name.c_str());
72
  check(input, "Input file '" << f_name << "' not found.");
73
  DigraphReader<Digraph>(input, digraph).
74
    readArcMap("capacity", length).
75
    readNode("source", start).
169
  std::istringstream input(test_lgf);
170
  digraphReader(input, digraph).
171
    arcMap("capacity", length).
172
    node("source", source).
76 173
    run();  
77 174
 
78 175
  {
79
    std::cout << "Checking Bin Heap" << std::endl;
80

	
81 176
    typedef BinHeap<Prio, ItemIntMap> IntHeap;
82 177
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
83
    heapSortTest<IntHeap>(100);
84
    heapIncreaseTest<IntHeap>(100);
178
    heapSortTest<IntHeap>();
179
    heapIncreaseTest<IntHeap>();
85 180
    
86
    typedef FibHeap<Prio, Digraph::NodeMap<int> > NodeHeap;
87
    checkConcept<Heap<Prio, Digraph::NodeMap<int> >, NodeHeap>();
88
    Timer timer;
89
    dijkstraHeapTest<Digraph, LengthMap, NodeHeap>(digraph, length, start);
90
    std::cout << timer << std::endl;
91
  }
92
  {
93
    std::cout << "Checking Fib Heap" << std::endl;
94

	
95
    typedef FibHeap<Prio, ItemIntMap> IntHeap;
96
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
97
    heapSortTest<IntHeap>(100);
98
    heapIncreaseTest<IntHeap>(100);
99

	
100
    typedef FibHeap<Prio, Digraph::NodeMap<int> > NodeHeap;
101
    checkConcept<Heap<Prio, Digraph::NodeMap<int> >, NodeHeap>();
102
    Timer timer;
103
    dijkstraHeapTest<Digraph, LengthMap, NodeHeap>(digraph, length, start);
104
    std::cout << timer << std::endl;
105
  }
106
  {
107
    std::cout << "Checking Radix Heap" << std::endl;
108

	
109
    typedef RadixHeap<ItemIntMap> IntHeap;
110
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
111
    heapSortTest<IntHeap>(100);
112
    heapIncreaseTest<IntHeap>(100);
113

	
114
    typedef RadixHeap<Digraph::NodeMap<int> > NodeHeap;
115
    checkConcept<Heap<Prio, Digraph::NodeMap<int> >, NodeHeap>();
116
    Timer timer;
117
    dijkstraHeapTest<Digraph, LengthMap, NodeHeap>(digraph, length, start);
118
    std::cout << timer << std::endl;
119
  }
120

	
121
  {
122
    std::cout << "Checking Bucket Heap" << std::endl;
123

	
124
    typedef BucketHeap<ItemIntMap> IntHeap;
125
    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
126
    heapSortTest<IntHeap>(100);
127
    heapIncreaseTest<IntHeap>(100);
128

	
129
    typedef BucketHeap<Digraph::NodeMap<int> > NodeHeap;
130
    checkConcept<Heap<Prio, Digraph::NodeMap<int> >, NodeHeap>();
131
    Timer timer;
132
    dijkstraHeapTest<Digraph, LengthMap, NodeHeap>(digraph, length, start);
133
    std::cout << timer << std::endl;
181
    typedef BinHeap<Prio, IntNodeMap > NodeHeap;
182
    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>();
183
    dijkstraHeapTest<NodeHeap>(digraph, length, source);
134 184
  }
135 185

	
136 186
  return 0;
137 187
}
Ignore white space 12 line context
1
/* -*- C++ -*-
2
 *
3
 * This file is a part of LEMON, a generic C++ optimization library
4
 *
5
 * Copyright (C) 2003-2008
6
 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
7
 * (Egervary Research Group on Combinatorial Optimization, EGRES).
8
 *
9
 * Permission to use, modify and distribute this software is granted
10
 * provided that this copyright notice appears in all copies. For
11
 * precise terms see the accompanying LICENSE file.
12
 *
13
 * This software is provided "AS IS" with no warranty of any kind,
14
 * express or implied, and with no claim as to its suitability for any
15
 * purpose.
16
 *
17
 */
18

	
19
#include <vector>
20
#include <algorithm>
21

	
22
#include <lemon/dijkstra.h>
23

	
24
class IntIntMap : public std::vector<int> {
25
public:
26
  typedef std::vector<int> Parent;
27

	
28
  typedef int Key;
29
  typedef int Value;
30

	
31
  IntIntMap() : Parent() {}
32
  IntIntMap(int n) : Parent(n) {}
33
  IntIntMap(int n, int v) : Parent(n, v) {}
34

	
35
  void set(int key, int value) {
36
    Parent::operator[](key) = value;
37
  }
38
};
39

	
40

	
41
template <typename _Heap>
42
void heapSortTest(int n) {
43
  typedef _Heap Heap;
44
  IntIntMap map(n, -1);
45

	
46
  Heap heap(map);
47
  
48
  std::vector<int> v(n);
49

	
50
  for (int i = 0; i < n; ++i) {
51
    v[i] = rnd[1000];
52
    heap.push(i, v[i]);
53
  }
54
  std::sort(v.begin(), v.end());
55
  for (int i = 0; i < n; ++i) {
56
    check(v[i] == heap.prio() ,"Wrong order in heap sort.");
57
    heap.pop();
58
  }
59
}
60

	
61
template <typename _Heap>
62
void heapIncreaseTest(int n) {
63
  typedef _Heap Heap;
64
  IntIntMap map(n, -1);
65

	
66
  Heap heap(map);
67
  
68
  std::vector<int> v(n);
69

	
70
  for (int i = 0; i < n; ++i) {
71
    v[i] = rnd[1000];
72
    heap.push(i, v[i]);
73
  }
74
  for (int i = 0; i < n; ++i) {
75
    v[i] += rnd[1000];
76
    heap.increase(i, v[i]);
77
  }
78
  std::sort(v.begin(), v.end());
79
  for (int i = 0; i < n; ++i) {
80
    check(v[i] == heap.prio() ,"Wrong order in heap increase test.");
81
    heap.pop();
82
  }
83
}
84

	
85

	
86

	
87
template <typename _Digraph, typename _LengthMap, typename _Heap>
88
void dijkstraHeapTest(_Digraph& digraph, _LengthMap& length,
89
		      typename _Digraph::Node& start) {
90

	
91
  typedef _Heap Heap;
92
  typedef _Digraph Digraph;
93
  typedef _LengthMap LengthMap;
94

	
95
  typedef typename Digraph::Node Node;
96
  typedef typename Digraph::Arc Arc;
97
  typedef typename Digraph::NodeIt NodeIt;
98
  typedef typename Digraph::ArcIt ArcIt;
99

	
100
  typename Dijkstra<Digraph, LengthMap>::template DefStandardHeap<Heap>::
101
    Create dijkstra(digraph, length);
102

	
103
  dijkstra.run(start);
104

	
105
  for(ArcIt e(digraph); e!=INVALID; ++e) {
106
    Node u=digraph.source(e); 
107
    Node v=digraph.target(e);
108
    if (dijkstra.reached(u)) {
109
      check( dijkstra.dist(v) - dijkstra.dist(u) <= length[e],
110
      	     "Error in a shortest path tree arc!");
111
    }
112
  }
113

	
114
  for(NodeIt v(digraph); v!=INVALID; ++v) {
115
    if ( dijkstra.reached(v) && dijkstra.predArc(v) != INVALID ) {
116
      Arc e=dijkstra.predArc(v);
117
      Node u=digraph.source(e);
118
      check( dijkstra.dist(v) - dijkstra .dist(u) == length[e],
119
	     "Error in a shortest path tree arc!");
120
    }
121
  }
122

	
123
}
0 comments (0 inline)