gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Icc compatibility fixes (ticket #84)
0 2 0
default
2 files changed with 13 insertions and 3 deletions:
↑ Collapse diff ↑
Ignore white space 6 line context
... ...
@@ -151,136 +151,146 @@
151 151
      typename exists<typename Out::Value>::type> {
152 152
      static const bool value = true;
153 153
    };
154 154

	
155 155
    template <typename In, typename InEnable = void>
156 156
    struct KruskalValueSelector {};
157 157

	
158 158
    template <typename In>
159 159
    struct KruskalValueSelector<In,
160 160
      typename enable_if<SequenceInputIndicator<In>, void>::type> 
161 161
    {
162 162
      typedef typename In::value_type::second_type Value;
163 163
    };    
164 164

	
165 165
    template <typename In>
166 166
    struct KruskalValueSelector<In,
167 167
      typename enable_if<MapInputIndicator<In>, void>::type> 
168 168
    {
169 169
      typedef typename In::Value Value;
170 170
    };    
171 171
    
172 172
    template <typename Graph, typename In, typename Out,
173 173
              typename InEnable = void>
174 174
    struct KruskalInputSelector {};
175 175

	
176 176
    template <typename Graph, typename In, typename Out,
177 177
              typename InEnable = void>
178 178
    struct KruskalOutputSelector {};
179 179
    
180 180
    template <typename Graph, typename In, typename Out>
181 181
    struct KruskalInputSelector<Graph, In, Out,
182 182
      typename enable_if<SequenceInputIndicator<In>, void>::type > 
183 183
    {
184 184
      typedef typename In::value_type::second_type Value;
185 185

	
186 186
      static Value kruskal(const Graph& graph, const In& in, Out& out) {
187 187
        return KruskalOutputSelector<Graph, In, Out>::
188 188
          kruskal(graph, in, out);
189 189
      }
190 190

	
191 191
    };
192 192

	
193 193
    template <typename Graph, typename In, typename Out>
194 194
    struct KruskalInputSelector<Graph, In, Out,
195 195
      typename enable_if<MapInputIndicator<In>, void>::type > 
196 196
    {
197 197
      typedef typename In::Value Value;
198 198
      static Value kruskal(const Graph& graph, const In& in, Out& out) {
199 199
        typedef typename In::Key MapArc;
200 200
        typedef typename In::Value Value;
201 201
        typedef typename ItemSetTraits<Graph, MapArc>::ItemIt MapArcIt;
202 202
        typedef std::vector<std::pair<MapArc, Value> > Sequence;
203 203
        Sequence seq;
204 204
        
205 205
        for (MapArcIt it(graph); it != INVALID; ++it) {
206 206
          seq.push_back(std::make_pair(it, in[it]));
207 207
        }
208 208

	
209 209
        std::sort(seq.begin(), seq.end(), PairComp<Sequence>());
210 210
        return KruskalOutputSelector<Graph, Sequence, Out>::
211 211
          kruskal(graph, seq, out);
212 212
      }
213 213
    };
214 214

	
215
    template <typename T>
216
    struct RemoveConst {
217
      typedef T type;
218
    };
219

	
220
    template <typename T>
221
    struct RemoveConst<const T> {
222
      typedef T type;
223
    };
224

	
215 225
    template <typename Graph, typename In, typename Out>
216 226
    struct KruskalOutputSelector<Graph, In, Out,
217 227
      typename enable_if<SequenceOutputIndicator<Out>, void>::type > 
218 228
    {
219 229
      typedef typename In::value_type::second_type Value;
220 230

	
221 231
      static Value kruskal(const Graph& graph, const In& in, Out& out) {
222
        typedef StoreBoolMap<Out> Map;
232
        typedef StoreBoolMap<typename RemoveConst<Out>::type> Map;
223 233
        Map map(out);
224 234
        return _kruskal_bits::kruskal(graph, in, map);
225 235
      }
226 236

	
227 237
    };
228 238

	
229 239
    template <typename Graph, typename In, typename Out>
230 240
    struct KruskalOutputSelector<Graph, In, Out,
231 241
      typename enable_if<MapOutputIndicator<Out>, void>::type > 
232 242
    {
233 243
      typedef typename In::value_type::second_type Value;
234 244

	
235 245
      static Value kruskal(const Graph& graph, const In& in, Out& out) {
236 246
        return _kruskal_bits::kruskal(graph, in, out);
237 247
      }
238 248
    };
239 249

	
240 250
  }
241 251

	
242 252
  /// \ingroup spantree
243 253
  ///
244 254
  /// \brief Kruskal's algorithm to find a minimum cost tree of a graph.
245 255
  ///
246 256
  /// This function runs Kruskal's algorithm to find a minimum cost tree.
247 257
  /// Due to some C++ hacking, it accepts various input and output types.
248 258
  ///
249 259
  /// \param g The graph the algorithm runs on.
250 260
  /// It can be either \ref concepts::Digraph "directed" or 
251 261
  /// \ref concepts::Graph "undirected".
252 262
  /// If the graph is directed, the algorithm consider it to be 
253 263
  /// undirected by disregarding the direction of the arcs.
254 264
  ///
255 265
  /// \param in This object is used to describe the arc costs. It can be one
256 266
  /// of the following choices.
257 267
  /// - An STL compatible 'Forward Container' with
258 268
  /// <tt>std::pair<GR::Edge,X></tt> or
259 269
  /// <tt>std::pair<GR::Arc,X></tt> as its <tt>value_type</tt>, where
260 270
  /// \c X is the type of the costs. The pairs indicates the arcs
261 271
  /// along with the assigned cost. <em>They must be in a
262 272
  /// cost-ascending order.</em>
263 273
  /// - Any readable Arc map. The values of the map indicate the arc costs.
264 274
  ///
265 275
  /// \retval out Here we also have a choise.
266 276
  /// - It can be a writable \c bool arc map.  After running the
267 277
  /// algorithm this will contain the found minimum cost spanning
268 278
  /// tree: the value of an arc will be set to \c true if it belongs
269 279
  /// to the tree, otherwise it will be set to \c false. The value of
270 280
  /// each arc will be set exactly once.
271 281
  /// - It can also be an iteraror of an STL Container with
272 282
  /// <tt>GR::Edge</tt> or <tt>GR::Arc</tt> as its
273 283
  /// <tt>value_type</tt>.  The algorithm copies the elements of the
274 284
  /// found tree into this sequence.  For example, if we know that the
275 285
  /// spanning tree of the graph \c g has say 53 arcs, then we can
276 286
  /// put its arcs into an STL vector \c tree with a code like this.
277 287
  ///\code
278 288
  /// std::vector<Arc> tree(53);
279 289
  /// kruskal(g,cost,tree.begin());
280 290
  ///\endcode
281 291
  /// Or if we don't know in advance the size of the tree, we can
282 292
  /// write this.  
283 293
  ///\code std::vector<Arc> tree;
284 294
  /// kruskal(g,cost,std::back_inserter(tree)); 
285 295
  ///\endcode
286 296
  ///
Ignore white space 128 line context
... ...
@@ -24,187 +24,187 @@
24 24
#include <lemon/maps.h>
25 25

	
26 26
#include "test_tools.h"
27 27

	
28 28
using namespace lemon;
29 29
using namespace lemon::concepts;
30 30

	
31 31
struct A {};
32 32
inline bool operator<(A, A) { return true; }
33 33
struct B {};
34 34

	
35 35
class C {
36 36
  int x;
37 37
public:
38 38
  C(int _x) : x(_x) {}
39 39
};
40 40

	
41 41
class F {
42 42
public:
43 43
  typedef A argument_type;
44 44
  typedef B result_type;
45 45

	
46 46
  B operator()(const A&) const { return B(); }
47 47
private:
48 48
  F& operator=(const F&);
49 49
};
50 50

	
51 51
int func(A) { return 3; }
52 52

	
53 53
int binc(int a, B) { return a+1; }
54 54

	
55 55
typedef ReadMap<A, double> DoubleMap;
56 56
typedef ReadWriteMap<A, double> DoubleWriteMap;
57 57
typedef ReferenceMap<A, double, double&, const double&> DoubleRefMap;
58 58

	
59 59
typedef ReadMap<A, bool> BoolMap;
60 60
typedef ReadWriteMap<A, bool> BoolWriteMap;
61 61
typedef ReferenceMap<A, bool, bool&, const bool&> BoolRefMap;
62 62

	
63 63
int main()
64 64
{
65 65
  // Map concepts
66 66
  checkConcept<ReadMap<A,B>, ReadMap<A,B> >();
67 67
  checkConcept<ReadMap<A,C>, ReadMap<A,C> >();
68 68
  checkConcept<WriteMap<A,B>, WriteMap<A,B> >();
69 69
  checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
70 70
  checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
71 71
  checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
72 72
  checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
73 73
  checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
74 74

	
75 75
  // NullMap
76 76
  {
77 77
    checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
78 78
    NullMap<A,B> map1;
79 79
    NullMap<A,B> map2 = map1;
80 80
    map1 = nullMap<A,B>();
81 81
  }
82 82

	
83 83
  // ConstMap
84 84
  {
85 85
    checkConcept<ReadWriteMap<A,B>, ConstMap<A,B> >();
86 86
    checkConcept<ReadWriteMap<A,C>, ConstMap<A,C> >();
87 87
    ConstMap<A,B> map1;
88
    ConstMap<A,B> map2(B());
88
    ConstMap<A,B> map2 = B();
89 89
    ConstMap<A,B> map3 = map1;
90 90
    map1 = constMap<A>(B());
91 91
    map1 = constMap<A,B>();
92 92
    map1.setAll(B());
93 93
    ConstMap<A,C> map4(C(1));
94 94
    ConstMap<A,C> map5 = map4;
95 95
    map4 = constMap<A>(C(2));
96 96
    map4.setAll(C(3));
97 97

	
98 98
    checkConcept<ReadWriteMap<A,int>, ConstMap<A,int> >();
99 99
    check(constMap<A>(10)[A()] == 10, "Something is wrong with ConstMap");
100 100

	
101 101
    checkConcept<ReadWriteMap<A,int>, ConstMap<A,Const<int,10> > >();
102 102
    ConstMap<A,Const<int,10> > map6;
103 103
    ConstMap<A,Const<int,10> > map7 = map6;
104 104
    map6 = constMap<A,int,10>();
105 105
    map7 = constMap<A,Const<int,10> >();
106 106
    check(map6[A()] == 10 && map7[A()] == 10, "Something is wrong with ConstMap");
107 107
  }
108 108

	
109 109
  // IdentityMap
110 110
  {
111 111
    checkConcept<ReadMap<A,A>, IdentityMap<A> >();
112 112
    IdentityMap<A> map1;
113 113
    IdentityMap<A> map2 = map1;
114 114
    map1 = identityMap<A>();
115 115

	
116 116
    checkConcept<ReadMap<double,double>, IdentityMap<double> >();
117 117
    check(identityMap<double>()[1.0] == 1.0 && identityMap<double>()[3.14] == 3.14,
118 118
          "Something is wrong with IdentityMap");
119 119
  }
120 120

	
121 121
  // RangeMap
122 122
  {
123 123
    checkConcept<ReferenceMap<int,B,B&,const B&>, RangeMap<B> >();
124 124
    RangeMap<B> map1;
125 125
    RangeMap<B> map2(10);
126 126
    RangeMap<B> map3(10,B());
127 127
    RangeMap<B> map4 = map1;
128 128
    RangeMap<B> map5 = rangeMap<B>();
129 129
    RangeMap<B> map6 = rangeMap<B>(10);
130 130
    RangeMap<B> map7 = rangeMap(10,B());
131 131

	
132 132
    checkConcept< ReferenceMap<int, double, double&, const double&>,
133 133
                  RangeMap<double> >();
134 134
    std::vector<double> v(10, 0);
135 135
    v[5] = 100;
136 136
    RangeMap<double> map8(v);
137 137
    RangeMap<double> map9 = rangeMap(v);
138 138
    check(map9.size() == 10 && map9[2] == 0 && map9[5] == 100,
139 139
          "Something is wrong with RangeMap");
140 140
  }
141 141

	
142 142
  // SparseMap
143 143
  {
144 144
    checkConcept<ReferenceMap<A,B,B&,const B&>, SparseMap<A,B> >();
145 145
    SparseMap<A,B> map1;
146
    SparseMap<A,B> map2(B());
146
    SparseMap<A,B> map2 = B();
147 147
    SparseMap<A,B> map3 = sparseMap<A,B>();
148 148
    SparseMap<A,B> map4 = sparseMap<A>(B());
149 149

	
150 150
    checkConcept< ReferenceMap<double, int, int&, const int&>,
151 151
                  SparseMap<double, int> >();
152 152
    std::map<double, int> m;
153 153
    SparseMap<double, int> map5(m);
154 154
    SparseMap<double, int> map6(m,10);
155 155
    SparseMap<double, int> map7 = sparseMap(m);
156 156
    SparseMap<double, int> map8 = sparseMap(m,10);
157 157

	
158 158
    check(map5[1.0] == 0 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 10,
159 159
          "Something is wrong with SparseMap");
160 160
    map5[1.0] = map6[3.14] = 100;
161 161
    check(map5[1.0] == 100 && map5[3.14] == 0 && map6[1.0] == 10 && map6[3.14] == 100,
162 162
          "Something is wrong with SparseMap");
163 163
  }
164 164

	
165 165
  // ComposeMap
166 166
  {
167 167
    typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
168 168
    checkConcept<ReadMap<B,double>, CompMap>();
169 169
    CompMap map1(DoubleMap(),ReadMap<B,A>());
170 170
    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
171 171

	
172 172
    SparseMap<double, bool> m1(false); m1[3.14] = true;
173 173
    RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
174 174
    check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1], "Something is wrong with ComposeMap")
175 175
  }
176 176

	
177 177
  // CombineMap
178 178
  {
179 179
    typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
180 180
    checkConcept<ReadMap<A,double>, CombMap>();
181 181
    CombMap map1(DoubleMap(), DoubleMap());
182 182
    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
183 183

	
184 184
    check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
185 185
          "Something is wrong with CombineMap");
186 186
  }
187 187

	
188 188
  // FunctorToMap, MapToFunctor
189 189
  {
190 190
    checkConcept<ReadMap<A,B>, FunctorToMap<F,A,B> >();
191 191
    checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
192 192
    FunctorToMap<F> map1;
193 193
    FunctorToMap<F> map2(F());
194 194
    B b = functorToMap(F())[A()];
195 195

	
196 196
    checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
197 197
    MapToFunctor<ReadMap<A,B> > map(ReadMap<A,B>());
198 198

	
199 199
    check(functorToMap(&func)[A()] == 3, "Something is wrong with FunctorToMap");
200 200
    check(mapToFunctor(constMap<A,int>(2))(A()) == 2, "Something is wrong with MapToFunctor");
201 201
    check(mapToFunctor(functorToMap(&func))(A()) == 3 && mapToFunctor(functorToMap(&func))[A()] == 3,
202 202
          "Something is wrong with FunctorToMap or MapToFunctor");
203 203
    check(functorToMap(mapToFunctor(constMap<A,int>(2)))[A()] == 2,
204 204
          "Something is wrong with FunctorToMap or MapToFunctor");
205 205
  }
206 206

	
207 207
  // ConvertMap
208 208
  {
209 209
    checkConcept<ReadMap<double,double>, ConvertMap<ReadMap<double, int>, double> >();
210 210
    ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
0 comments (0 inline)