gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Intel C++ compatibility fix in max_cardinality_search.h
0 1 0
default
1 file changed with 15 insertions and 8 deletions:
↑ Collapse diff ↑
Ignore white space 96 line context
... ...
@@ -357,113 +357,120 @@
357 357
    struct SetHeap
358 358
      : public MaxCardinalitySearch<Digraph, CapacityMap, 
359 359
                                    DefHeapTraits<H, CR> > { 
360 360
      typedef MaxCardinalitySearch< Digraph, CapacityMap, 
361 361
                                    DefHeapTraits<H, CR> > Create;
362 362
    };
363 363

	
364 364
    template <class H, class CR>
365 365
    struct DefStandardHeapTraits : public Traits {
366 366
      typedef CR HeapCrossRef;
367 367
      typedef H Heap;
368 368
      static HeapCrossRef *createHeapCrossRef(const Digraph &digraph) {
369 369
	return new HeapCrossRef(digraph);
370 370
      }
371 371
      static Heap *createHeap(HeapCrossRef &crossref) {
372 372
	return new Heap(crossref);
373 373
      }
374 374
    };
375 375

	
376 376
    /// \brief \ref named-templ-param "Named parameter" for setting heap and 
377 377
    /// cross reference type with automatic allocation
378 378
    ///
379 379
    /// \ref named-templ-param "Named parameter" for setting heap and cross 
380 380
    /// reference type. It can allocate the heap and the cross reference 
381 381
    /// object if the cross reference's constructor waits for the digraph as 
382 382
    /// parameter and the heap's constructor waits for the cross reference.
383 383
    template <class H, class CR = typename Digraph::template NodeMap<int> >
384 384
    struct SetStandardHeap
385 385
      : public MaxCardinalitySearch<Digraph, CapacityMap, 
386 386
                                    DefStandardHeapTraits<H, CR> > { 
387 387
      typedef MaxCardinalitySearch<Digraph, CapacityMap, 
388 388
                                   DefStandardHeapTraits<H, CR> > 
389 389
      Create;
390 390
    };
391 391
    
392 392
    ///@}
393 393

	
394 394

	
395 395
  protected:
396 396

	
397 397
    MaxCardinalitySearch() {}
398 398

	
399 399
  public:      
400 400
    
401 401
    /// \brief Constructor.
402 402
    ///
403 403
    ///\param digraph the digraph the algorithm will run on.
404 404
    ///\param capacity the capacity map used by the algorithm.
405
    ///When no capacity map given, a constant 1 capacity map will
406
    ///be allocated.
407
#ifdef DOXYGEN
408 405
    MaxCardinalitySearch(const Digraph& digraph,
409
			 const CapacityMap& capacity=0 ) :
410
#else
411
    MaxCardinalitySearch(const Digraph& digraph,
412
			 const CapacityMap& capacity=*static_cast<const CapacityMap*>(0) ) :
413
#endif
406
			 const CapacityMap& capacity) :
414 407
      _graph(&digraph),
415 408
      _capacity(&capacity), local_capacity(false),
416 409
      _cardinality(0), local_cardinality(false),
417 410
      _processed(0), local_processed(false),
418 411
      _heap_cross_ref(0), local_heap_cross_ref(false),
419 412
      _heap(0), local_heap(false)
420 413
    { }
421 414

	
415
    /// \brief Constructor.
416
    ///
417
    ///\param digraph the digraph the algorithm will run on.
418
    ///
419
    ///A constant 1 capacity map will be allocated.
420
    MaxCardinalitySearch(const Digraph& digraph) :
421
      _graph(&digraph),
422
      _capacity(0), local_capacity(false),
423
      _cardinality(0), local_cardinality(false),
424
      _processed(0), local_processed(false),
425
      _heap_cross_ref(0), local_heap_cross_ref(false),
426
      _heap(0), local_heap(false)
427
    { }
428

	
422 429
    /// \brief Destructor.
423 430
    ~MaxCardinalitySearch() {
424 431
      if(local_capacity) delete _capacity;
425 432
      if(local_cardinality) delete _cardinality;
426 433
      if(local_processed) delete _processed;
427 434
      if(local_heap_cross_ref) delete _heap_cross_ref;
428 435
      if(local_heap) delete _heap;
429 436
    }
430 437

	
431 438
    /// \brief Sets the capacity map.
432 439
    ///
433 440
    /// Sets the capacity map.
434 441
    /// \return <tt> (*this) </tt>
435 442
    MaxCardinalitySearch &capacityMap(const CapacityMap &m) {
436 443
      if (local_capacity) {
437 444
	delete _capacity;
438 445
	local_capacity=false;
439 446
      }
440 447
      _capacity=&m;
441 448
      return *this;
442 449
    }
443 450

	
444 451
    /// \brief Returns a const reference to the capacity map.
445 452
    ///
446 453
    /// Returns a const reference to the capacity map used by
447 454
    /// the algorithm.
448 455
    const CapacityMap &capacityMap() const {
449 456
      return *_capacity;
450 457
    }
451 458

	
452 459
    /// \brief Sets the map storing the cardinalities calculated by the 
453 460
    /// algorithm.
454 461
    ///
455 462
    /// Sets the map storing the cardinalities calculated by the algorithm.
456 463
    /// If you don't use this function before calling \ref run(),
457 464
    /// it will allocate one. The destuctor deallocates this
458 465
    /// automatically allocated map, of course.
459 466
    /// \return <tt> (*this) </tt>
460 467
    MaxCardinalitySearch &cardinalityMap(CardinalityMap &m) {
461 468
      if(local_cardinality) {
462 469
	delete _cardinality;
463 470
	local_cardinality=false;
464 471
      }
465 472
      _cardinality = &m;
466 473
      return *this;
467 474
    }
468 475

	
469 476
    /// \brief Sets the map storing the processed nodes.
0 comments (0 inline)