COIN-OR::LEMON - Graph Library

Changeset 728:532697c9fa53 in lemon


Ignore:
Timestamp:
06/11/09 22:11:29 (9 years ago)
Author:
Balazs Dezso <deba@…>
Branch:
default
Message:

Port remaining heaps from SVN -r 3509 (#50)

Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/Makefile.am

    r714 r728  
    6060        lemon/bfs.h \ 
    6161        lemon/bin_heap.h \ 
     62        lemon/bucket_heap.h \ 
    6263        lemon/cbc.h \ 
    6364        lemon/circulation.h \ 
     
    7778        lemon/error.h \ 
    7879        lemon/euler.h \ 
     80        lemon/fib_heap.h \ 
    7981        lemon/full_graph.h \ 
    8082        lemon/glpk.h \ 
     
    100102        lemon/path.h \ 
    101103        lemon/preflow.h \ 
     104        lemon/radix_heap.h \ 
    102105        lemon/radix_sort.h \ 
    103106        lemon/random.h \ 
  • test/heap_test.cc

    r463 r728  
    3232 
    3333#include <lemon/bin_heap.h> 
     34#include <lemon/fib_heap.h> 
     35#include <lemon/radix_heap.h> 
     36#include <lemon/bucket_heap.h> 
    3437 
    3538#include "test_tools.h" 
     
    184187  } 
    185188 
     189  { 
     190    typedef FibHeap<Prio, ItemIntMap> IntHeap; 
     191    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 
     192    heapSortTest<IntHeap>(); 
     193    heapIncreaseTest<IntHeap>(); 
     194 
     195    typedef FibHeap<Prio, IntNodeMap > NodeHeap; 
     196    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 
     197    dijkstraHeapTest<NodeHeap>(digraph, length, source); 
     198  } 
     199 
     200  { 
     201    typedef RadixHeap<ItemIntMap> IntHeap; 
     202    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 
     203    heapSortTest<IntHeap>(); 
     204    heapIncreaseTest<IntHeap>(); 
     205 
     206    typedef RadixHeap<IntNodeMap > NodeHeap; 
     207    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 
     208    dijkstraHeapTest<NodeHeap>(digraph, length, source); 
     209  } 
     210 
     211  { 
     212    typedef BucketHeap<ItemIntMap> IntHeap; 
     213    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>(); 
     214    heapSortTest<IntHeap>(); 
     215    heapIncreaseTest<IntHeap>(); 
     216 
     217    typedef BucketHeap<IntNodeMap > NodeHeap; 
     218    checkConcept<Heap<Prio, IntNodeMap >, NodeHeap>(); 
     219    dijkstraHeapTest<NodeHeap>(digraph, length, source); 
     220  } 
     221 
     222 
    186223  return 0; 
    187224} 
Note: See TracChangeset for help on using the changeset viewer.