gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Fix gcc 3.3 compilation error (#354) gcc 3.3 requires that a class has a default constructor if it has template named parameters. (That constructor can be protected.)
0 6 0
default
6 files changed with 24 insertions and 0 deletions:
↑ Collapse diff ↑
Ignore white space 96 line context
... ...
@@ -256,96 +256,100 @@
256 256
                  _pred[v] = a;
257 257
                }
258 258
                break;
259 259
              case Heap::POST_HEAP:
260 260
                break;
261 261
            }
262 262
          }
263 263
        }
264 264
        if (heap.empty()) return -1;
265 265

	
266 266
        // Update potentials of processed nodes
267 267
        int t = heap.top();
268 268
        Cost dt = heap.prio();
269 269
        for (int i = 0; i < int(_proc_nodes.size()); ++i) {
270 270
          _pi[_proc_nodes[i]] += _dist[_proc_nodes[i]] - dt;
271 271
        }
272 272

	
273 273
        return t;
274 274
      }
275 275

	
276 276
    }; //class ResidualDijkstra
277 277

	
278 278
  public:
279 279

	
280 280
    /// \name Named Template Parameters
281 281
    /// @{
282 282

	
283 283
    template <typename T>
284 284
    struct SetHeapTraits : public Traits {
285 285
      typedef T Heap;
286 286
    };
287 287

	
288 288
    /// \brief \ref named-templ-param "Named parameter" for setting
289 289
    /// \c Heap type.
290 290
    ///
291 291
    /// \ref named-templ-param "Named parameter" for setting \c Heap
292 292
    /// type, which is used for internal Dijkstra computations.
293 293
    /// It must conform to the \ref lemon::concepts::Heap "Heap" concept,
294 294
    /// its priority type must be \c Cost and its cross reference type
295 295
    /// must be \ref RangeMap "RangeMap<int>".
296 296
    template <typename T>
297 297
    struct SetHeap
298 298
      : public CapacityScaling<GR, V, C, SetHeapTraits<T> > {
299 299
      typedef  CapacityScaling<GR, V, C, SetHeapTraits<T> > Create;
300 300
    };
301 301

	
302 302
    /// @}
303 303

	
304
  protected:
305

	
306
    CapacityScaling() {}
307

	
304 308
  public:
305 309

	
306 310
    /// \brief Constructor.
307 311
    ///
308 312
    /// The constructor of the class.
309 313
    ///
310 314
    /// \param graph The digraph the algorithm runs on.
311 315
    CapacityScaling(const GR& graph) :
312 316
      _graph(graph), _node_id(graph), _arc_idf(graph), _arc_idb(graph),
313 317
      INF(std::numeric_limits<Value>::has_infinity ?
314 318
          std::numeric_limits<Value>::infinity() :
315 319
          std::numeric_limits<Value>::max())
316 320
    {
317 321
      // Check the number types
318 322
      LEMON_ASSERT(std::numeric_limits<Value>::is_signed,
319 323
        "The flow type of CapacityScaling must be signed");
320 324
      LEMON_ASSERT(std::numeric_limits<Cost>::is_signed,
321 325
        "The cost type of CapacityScaling must be signed");
322 326

	
323 327
      // Reset data structures
324 328
      reset();
325 329
    }
326 330

	
327 331
    /// \name Parameters
328 332
    /// The parameters of the algorithm can be specified using these
329 333
    /// functions.
330 334

	
331 335
    /// @{
332 336

	
333 337
    /// \brief Set the lower bounds on the arcs.
334 338
    ///
335 339
    /// This function sets the lower bounds on the arcs.
336 340
    /// If it is not used before calling \ref run(), the lower bounds
337 341
    /// will be set to zero on all arcs.
338 342
    ///
339 343
    /// \param map An arc map storing the lower bounds.
340 344
    /// Its \c Value type must be convertible to the \c Value type
341 345
    /// of the algorithm.
342 346
    ///
343 347
    /// \return <tt>(*this)</tt>
344 348
    template <typename LowerMap>
345 349
    CapacityScaling& lowerMap(const LowerMap& map) {
346 350
      _have_lower = true;
347 351
      for (ArcIt a(_graph); a != INVALID; ++a) {
348 352
        _lower[_arc_idf[a]] = map[a];
349 353
        _lower[_arc_idb[a]] = map[a];
350 354
      }
351 355
      return *this;
Ignore white space 96 line context
... ...
@@ -280,96 +280,100 @@
280 280

	
281 281
    IntVector _buckets;
282 282
    IntVector _bucket_next;
283 283
    IntVector _bucket_prev;
284 284
    IntVector _rank;
285 285
    int _max_rank;
286 286
  
287 287
    // Data for a StaticDigraph structure
288 288
    typedef std::pair<int, int> IntPair;
289 289
    StaticDigraph _sgr;
290 290
    std::vector<IntPair> _arc_vec;
291 291
    std::vector<LargeCost> _cost_vec;
292 292
    LargeCostArcMap _cost_map;
293 293
    LargeCostNodeMap _pi_map;
294 294
  
295 295
  public:
296 296
  
297 297
    /// \brief Constant for infinite upper bounds (capacities).
298 298
    ///
299 299
    /// Constant for infinite upper bounds (capacities).
300 300
    /// It is \c std::numeric_limits<Value>::infinity() if available,
301 301
    /// \c std::numeric_limits<Value>::max() otherwise.
302 302
    const Value INF;
303 303

	
304 304
  public:
305 305

	
306 306
    /// \name Named Template Parameters
307 307
    /// @{
308 308

	
309 309
    template <typename T>
310 310
    struct SetLargeCostTraits : public Traits {
311 311
      typedef T LargeCost;
312 312
    };
313 313

	
314 314
    /// \brief \ref named-templ-param "Named parameter" for setting
315 315
    /// \c LargeCost type.
316 316
    ///
317 317
    /// \ref named-templ-param "Named parameter" for setting \c LargeCost
318 318
    /// type, which is used for internal computations in the algorithm.
319 319
    /// \c Cost must be convertible to \c LargeCost.
320 320
    template <typename T>
321 321
    struct SetLargeCost
322 322
      : public CostScaling<GR, V, C, SetLargeCostTraits<T> > {
323 323
      typedef  CostScaling<GR, V, C, SetLargeCostTraits<T> > Create;
324 324
    };
325 325

	
326 326
    /// @}
327 327

	
328
  protected:
329

	
330
    CostScaling() {}
331

	
328 332
  public:
329 333

	
330 334
    /// \brief Constructor.
331 335
    ///
332 336
    /// The constructor of the class.
333 337
    ///
334 338
    /// \param graph The digraph the algorithm runs on.
335 339
    CostScaling(const GR& graph) :
336 340
      _graph(graph), _node_id(graph), _arc_idf(graph), _arc_idb(graph),
337 341
      _cost_map(_cost_vec), _pi_map(_pi),
338 342
      INF(std::numeric_limits<Value>::has_infinity ?
339 343
          std::numeric_limits<Value>::infinity() :
340 344
          std::numeric_limits<Value>::max())
341 345
    {
342 346
      // Check the number types
343 347
      LEMON_ASSERT(std::numeric_limits<Value>::is_signed,
344 348
        "The flow type of CostScaling must be signed");
345 349
      LEMON_ASSERT(std::numeric_limits<Cost>::is_signed,
346 350
        "The cost type of CostScaling must be signed");
347 351
      
348 352
      // Reset data structures
349 353
      reset();
350 354
    }
351 355

	
352 356
    /// \name Parameters
353 357
    /// The parameters of the algorithm can be specified using these
354 358
    /// functions.
355 359

	
356 360
    /// @{
357 361

	
358 362
    /// \brief Set the lower bounds on the arcs.
359 363
    ///
360 364
    /// This function sets the lower bounds on the arcs.
361 365
    /// If it is not used before calling \ref run(), the lower bounds
362 366
    /// will be set to zero on all arcs.
363 367
    ///
364 368
    /// \param map An arc map storing the lower bounds.
365 369
    /// Its \c Value type must be convertible to the \c Value type
366 370
    /// of the algorithm.
367 371
    ///
368 372
    /// \return <tt>(*this)</tt>
369 373
    template <typename LowerMap>
370 374
    CostScaling& lowerMap(const LowerMap& map) {
371 375
      _have_lower = true;
372 376
      for (ArcIt a(_graph); a != INVALID; ++a) {
373 377
        _lower[_arc_idf[a]] = map[a];
374 378
        _lower[_arc_idb[a]] = map[a];
375 379
      }
Ignore white space 96 line context
... ...
@@ -196,96 +196,100 @@
196 196

	
197 197
    Tolerance _tolerance;
198 198

	
199 199
    // Infinite constant
200 200
    const LargeValue INF;
201 201

	
202 202
  public:
203 203

	
204 204
    /// \name Named Template Parameters
205 205
    /// @{
206 206

	
207 207
    template <typename T>
208 208
    struct SetLargeValueTraits : public Traits {
209 209
      typedef T LargeValue;
210 210
      typedef lemon::Tolerance<T> Tolerance;
211 211
    };
212 212

	
213 213
    /// \brief \ref named-templ-param "Named parameter" for setting
214 214
    /// \c LargeValue type.
215 215
    ///
216 216
    /// \ref named-templ-param "Named parameter" for setting \c LargeValue
217 217
    /// type. It is used for internal computations in the algorithm.
218 218
    template <typename T>
219 219
    struct SetLargeValue
220 220
      : public HartmannOrlin<GR, LEN, SetLargeValueTraits<T> > {
221 221
      typedef HartmannOrlin<GR, LEN, SetLargeValueTraits<T> > Create;
222 222
    };
223 223

	
224 224
    template <typename T>
225 225
    struct SetPathTraits : public Traits {
226 226
      typedef T Path;
227 227
    };
228 228

	
229 229
    /// \brief \ref named-templ-param "Named parameter" for setting
230 230
    /// \c %Path type.
231 231
    ///
232 232
    /// \ref named-templ-param "Named parameter" for setting the \c %Path
233 233
    /// type of the found cycles.
234 234
    /// It must conform to the \ref lemon::concepts::Path "Path" concept
235 235
    /// and it must have an \c addFront() function.
236 236
    template <typename T>
237 237
    struct SetPath
238 238
      : public HartmannOrlin<GR, LEN, SetPathTraits<T> > {
239 239
      typedef HartmannOrlin<GR, LEN, SetPathTraits<T> > Create;
240 240
    };
241 241

	
242 242
    /// @}
243 243

	
244
  protected:
245

	
246
    HartmannOrlin() {}
247

	
244 248
  public:
245 249

	
246 250
    /// \brief Constructor.
247 251
    ///
248 252
    /// The constructor of the class.
249 253
    ///
250 254
    /// \param digraph The digraph the algorithm runs on.
251 255
    /// \param length The lengths (costs) of the arcs.
252 256
    HartmannOrlin( const Digraph &digraph,
253 257
                   const LengthMap &length ) :
254 258
      _gr(digraph), _length(length), _comp(digraph), _out_arcs(digraph),
255 259
      _best_found(false), _best_length(0), _best_size(1),
256 260
      _cycle_path(NULL), _local_path(false), _data(digraph),
257 261
      INF(std::numeric_limits<LargeValue>::has_infinity ?
258 262
          std::numeric_limits<LargeValue>::infinity() :
259 263
          std::numeric_limits<LargeValue>::max())
260 264
    {}
261 265

	
262 266
    /// Destructor.
263 267
    ~HartmannOrlin() {
264 268
      if (_local_path) delete _cycle_path;
265 269
    }
266 270

	
267 271
    /// \brief Set the path structure for storing the found cycle.
268 272
    ///
269 273
    /// This function sets an external path structure for storing the
270 274
    /// found cycle.
271 275
    ///
272 276
    /// If you don't call this function before calling \ref run() or
273 277
    /// \ref findMinMean(), it will allocate a local \ref Path "path"
274 278
    /// structure. The destuctor deallocates this automatically
275 279
    /// allocated object, of course.
276 280
    ///
277 281
    /// \note The algorithm calls only the \ref lemon::Path::addFront()
278 282
    /// "addFront()" function of the given path structure.
279 283
    ///
280 284
    /// \return <tt>(*this)</tt>
281 285
    HartmannOrlin& cycle(Path &path) {
282 286
      if (_local_path) {
283 287
        delete _cycle_path;
284 288
        _local_path = false;
285 289
      }
286 290
      _cycle_path = &path;
287 291
      return *this;
288 292
    }
289 293

	
290 294
    /// \brief Set the tolerance used by the algorithm.
291 295
    ///
Ignore white space 96 line context
... ...
@@ -186,96 +186,100 @@
186 186

	
187 187
    Tolerance _tolerance;
188 188
  
189 189
    // Infinite constant
190 190
    const LargeValue INF;
191 191

	
192 192
  public:
193 193
  
194 194
    /// \name Named Template Parameters
195 195
    /// @{
196 196

	
197 197
    template <typename T>
198 198
    struct SetLargeValueTraits : public Traits {
199 199
      typedef T LargeValue;
200 200
      typedef lemon::Tolerance<T> Tolerance;
201 201
    };
202 202

	
203 203
    /// \brief \ref named-templ-param "Named parameter" for setting
204 204
    /// \c LargeValue type.
205 205
    ///
206 206
    /// \ref named-templ-param "Named parameter" for setting \c LargeValue
207 207
    /// type. It is used for internal computations in the algorithm.
208 208
    template <typename T>
209 209
    struct SetLargeValue
210 210
      : public Howard<GR, LEN, SetLargeValueTraits<T> > {
211 211
      typedef Howard<GR, LEN, SetLargeValueTraits<T> > Create;
212 212
    };
213 213

	
214 214
    template <typename T>
215 215
    struct SetPathTraits : public Traits {
216 216
      typedef T Path;
217 217
    };
218 218

	
219 219
    /// \brief \ref named-templ-param "Named parameter" for setting
220 220
    /// \c %Path type.
221 221
    ///
222 222
    /// \ref named-templ-param "Named parameter" for setting the \c %Path
223 223
    /// type of the found cycles.
224 224
    /// It must conform to the \ref lemon::concepts::Path "Path" concept
225 225
    /// and it must have an \c addBack() function.
226 226
    template <typename T>
227 227
    struct SetPath
228 228
      : public Howard<GR, LEN, SetPathTraits<T> > {
229 229
      typedef Howard<GR, LEN, SetPathTraits<T> > Create;
230 230
    };
231 231
    
232 232
    /// @}
233 233

	
234
  protected:
235

	
236
    Howard() {}
237

	
234 238
  public:
235 239

	
236 240
    /// \brief Constructor.
237 241
    ///
238 242
    /// The constructor of the class.
239 243
    ///
240 244
    /// \param digraph The digraph the algorithm runs on.
241 245
    /// \param length The lengths (costs) of the arcs.
242 246
    Howard( const Digraph &digraph,
243 247
            const LengthMap &length ) :
244 248
      _gr(digraph), _length(length), _best_found(false),
245 249
      _best_length(0), _best_size(1), _cycle_path(NULL), _local_path(false),
246 250
      _policy(digraph), _reached(digraph), _level(digraph), _dist(digraph),
247 251
      _comp(digraph), _in_arcs(digraph),
248 252
      INF(std::numeric_limits<LargeValue>::has_infinity ?
249 253
          std::numeric_limits<LargeValue>::infinity() :
250 254
          std::numeric_limits<LargeValue>::max())
251 255
    {}
252 256

	
253 257
    /// Destructor.
254 258
    ~Howard() {
255 259
      if (_local_path) delete _cycle_path;
256 260
    }
257 261

	
258 262
    /// \brief Set the path structure for storing the found cycle.
259 263
    ///
260 264
    /// This function sets an external path structure for storing the
261 265
    /// found cycle.
262 266
    ///
263 267
    /// If you don't call this function before calling \ref run() or
264 268
    /// \ref findMinMean(), it will allocate a local \ref Path "path"
265 269
    /// structure. The destuctor deallocates this automatically
266 270
    /// allocated object, of course.
267 271
    ///
268 272
    /// \note The algorithm calls only the \ref lemon::Path::addBack()
269 273
    /// "addBack()" function of the given path structure.
270 274
    ///
271 275
    /// \return <tt>(*this)</tt>
272 276
    Howard& cycle(Path &path) {
273 277
      if (_local_path) {
274 278
        delete _cycle_path;
275 279
        _local_path = false;
276 280
      }
277 281
      _cycle_path = &path;
278 282
      return *this;
279 283
    }
280 284

	
281 285
    /// \brief Set the tolerance used by the algorithm.
Ignore white space 96 line context
... ...
@@ -192,96 +192,100 @@
192 192

	
193 193
    Tolerance _tolerance;
194 194
    
195 195
    // Infinite constant
196 196
    const LargeValue INF;
197 197

	
198 198
  public:
199 199

	
200 200
    /// \name Named Template Parameters
201 201
    /// @{
202 202

	
203 203
    template <typename T>
204 204
    struct SetLargeValueTraits : public Traits {
205 205
      typedef T LargeValue;
206 206
      typedef lemon::Tolerance<T> Tolerance;
207 207
    };
208 208

	
209 209
    /// \brief \ref named-templ-param "Named parameter" for setting
210 210
    /// \c LargeValue type.
211 211
    ///
212 212
    /// \ref named-templ-param "Named parameter" for setting \c LargeValue
213 213
    /// type. It is used for internal computations in the algorithm.
214 214
    template <typename T>
215 215
    struct SetLargeValue
216 216
      : public Karp<GR, LEN, SetLargeValueTraits<T> > {
217 217
      typedef Karp<GR, LEN, SetLargeValueTraits<T> > Create;
218 218
    };
219 219

	
220 220
    template <typename T>
221 221
    struct SetPathTraits : public Traits {
222 222
      typedef T Path;
223 223
    };
224 224

	
225 225
    /// \brief \ref named-templ-param "Named parameter" for setting
226 226
    /// \c %Path type.
227 227
    ///
228 228
    /// \ref named-templ-param "Named parameter" for setting the \c %Path
229 229
    /// type of the found cycles.
230 230
    /// It must conform to the \ref lemon::concepts::Path "Path" concept
231 231
    /// and it must have an \c addFront() function.
232 232
    template <typename T>
233 233
    struct SetPath
234 234
      : public Karp<GR, LEN, SetPathTraits<T> > {
235 235
      typedef Karp<GR, LEN, SetPathTraits<T> > Create;
236 236
    };
237 237

	
238 238
    /// @}
239 239

	
240
  protected:
241

	
242
    Karp() {}
243

	
240 244
  public:
241 245

	
242 246
    /// \brief Constructor.
243 247
    ///
244 248
    /// The constructor of the class.
245 249
    ///
246 250
    /// \param digraph The digraph the algorithm runs on.
247 251
    /// \param length The lengths (costs) of the arcs.
248 252
    Karp( const Digraph &digraph,
249 253
          const LengthMap &length ) :
250 254
      _gr(digraph), _length(length), _comp(digraph), _out_arcs(digraph),
251 255
      _cycle_length(0), _cycle_size(1), _cycle_node(INVALID),
252 256
      _cycle_path(NULL), _local_path(false), _data(digraph),
253 257
      INF(std::numeric_limits<LargeValue>::has_infinity ?
254 258
          std::numeric_limits<LargeValue>::infinity() :
255 259
          std::numeric_limits<LargeValue>::max())
256 260
    {}
257 261

	
258 262
    /// Destructor.
259 263
    ~Karp() {
260 264
      if (_local_path) delete _cycle_path;
261 265
    }
262 266

	
263 267
    /// \brief Set the path structure for storing the found cycle.
264 268
    ///
265 269
    /// This function sets an external path structure for storing the
266 270
    /// found cycle.
267 271
    ///
268 272
    /// If you don't call this function before calling \ref run() or
269 273
    /// \ref findMinMean(), it will allocate a local \ref Path "path"
270 274
    /// structure. The destuctor deallocates this automatically
271 275
    /// allocated object, of course.
272 276
    ///
273 277
    /// \note The algorithm calls only the \ref lemon::Path::addFront()
274 278
    /// "addFront()" function of the given path structure.
275 279
    ///
276 280
    /// \return <tt>(*this)</tt>
277 281
    Karp& cycle(Path &path) {
278 282
      if (_local_path) {
279 283
        delete _cycle_path;
280 284
        _local_path = false;
281 285
      }
282 286
      _cycle_path = &path;
283 287
      return *this;
284 288
    }
285 289

	
286 290
    /// \brief Set the tolerance used by the algorithm.
287 291
    ///
Ignore white space 96 line context
... ...
@@ -358,96 +358,100 @@
358 358
    /// \brief \ref named-templ-param "Named parameter" for setting
359 359
    /// \c Heap and \c HeapCrossRef types.
360 360
    ///
361 361
    /// \ref named-templ-param "Named parameter" for setting \c Heap
362 362
    /// and \c HeapCrossRef types with automatic allocation. 
363 363
    /// They will be used for internal Dijkstra computations.
364 364
    /// The heap type must conform to the \ref lemon::concepts::Heap "Heap"
365 365
    /// concept and its priority type must be \c Length.
366 366
    template <typename H,
367 367
              typename CR = typename Digraph::template NodeMap<int> >
368 368
    struct SetHeap
369 369
      : public Suurballe<GR, LEN, SetHeapTraits<H, CR> > {
370 370
      typedef Suurballe<GR, LEN, SetHeapTraits<H, CR> > Create;
371 371
    };
372 372

	
373 373
    /// @}
374 374

	
375 375
  private:
376 376

	
377 377
    // The digraph the algorithm runs on
378 378
    const Digraph &_graph;
379 379
    // The length map
380 380
    const LengthMap &_length;
381 381

	
382 382
    // Arc map of the current flow
383 383
    FlowMap *_flow;
384 384
    bool _local_flow;
385 385
    // Node map of the current potentials
386 386
    PotentialMap *_potential;
387 387
    bool _local_potential;
388 388

	
389 389
    // The source node
390 390
    Node _s;
391 391
    // The target node
392 392
    Node _t;
393 393

	
394 394
    // Container to store the found paths
395 395
    std::vector<Path> _paths;
396 396
    int _path_num;
397 397

	
398 398
    // The pred arc map
399 399
    PredMap _pred;
400 400
    
401 401
    // Data for full init
402 402
    PotentialMap *_init_dist;
403 403
    PredMap *_init_pred;
404 404
    bool _full_init;
405 405

	
406
  protected:
407

	
408
    Suurballe() {}
409

	
406 410
  public:
407 411

	
408 412
    /// \brief Constructor.
409 413
    ///
410 414
    /// Constructor.
411 415
    ///
412 416
    /// \param graph The digraph the algorithm runs on.
413 417
    /// \param length The length (cost) values of the arcs.
414 418
    Suurballe( const Digraph &graph,
415 419
               const LengthMap &length ) :
416 420
      _graph(graph), _length(length), _flow(0), _local_flow(false),
417 421
      _potential(0), _local_potential(false), _pred(graph),
418 422
      _init_dist(0), _init_pred(0)
419 423
    {}
420 424

	
421 425
    /// Destructor.
422 426
    ~Suurballe() {
423 427
      if (_local_flow) delete _flow;
424 428
      if (_local_potential) delete _potential;
425 429
      delete _init_dist;
426 430
      delete _init_pred;
427 431
    }
428 432

	
429 433
    /// \brief Set the flow map.
430 434
    ///
431 435
    /// This function sets the flow map.
432 436
    /// If it is not used before calling \ref run() or \ref init(),
433 437
    /// an instance will be allocated automatically. The destructor
434 438
    /// deallocates this automatically allocated map, of course.
435 439
    ///
436 440
    /// The found flow contains only 0 and 1 values, since it is the
437 441
    /// union of the found arc-disjoint paths.
438 442
    ///
439 443
    /// \return <tt>(*this)</tt>
440 444
    Suurballe& flowMap(FlowMap &map) {
441 445
      if (_local_flow) {
442 446
        delete _flow;
443 447
        _local_flow = false;
444 448
      }
445 449
      _flow = &map;
446 450
      return *this;
447 451
    }
448 452

	
449 453
    /// \brief Set the potential map.
450 454
    ///
451 455
    /// This function sets the potential map.
452 456
    /// If it is not used before calling \ref run() or \ref init(),
453 457
    /// an instance will be allocated automatically. The destructor
0 comments (0 inline)