COIN-OR::LEMON - Graph Library

Changeset 2269:fb1c634fff29 in lemon-0.x


Ignore:
Timestamp:
10/30/06 13:07:52 (13 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3027
Message:

Bug fix for removing heap Item from template parameter list

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • demo/coloring.cc

    r2207 r2269  
    6464 
    6565  Graph::NodeMap<int> heapMap(graph, -1);
    66   BucketHeap<Node, Graph::NodeMap<int> > heap(heapMap);
     66  BucketHeap<Graph::NodeMap<int> > heap(heapMap);
    6767 
    6868  for (NodeIt it(graph); it != INVALID; ++it) {
  • lemon/bipartite_matching.h

    r2263 r2269  
    10951095    ///
    10961096    /// \sa BinHeap
    1097     typedef BinHeap<typename BpUGraph::Node, Value, HeapCrossRef> Heap;
     1097    typedef BinHeap<Value, HeapCrossRef> Heap;
    10981098   
    10991099    /// \brief Instantiates a Heap.
  • lemon/dijkstra.h

    r2263 r2269  
    10151015    ///The heap type used by the dijkstra algorithm.
    10161016    typedef typename TR::Heap Heap;
    1017 public:
     1017  public:
    10181018    /// Constructor.
    10191019    DijkstraWizard() : TR() {}
  • test/all_pairs_shortest_path_test.cc

    r2242 r2269  
    7575  }
    7676
    77   typedef FibHeap<Node, int, Graph::NodeMap<int> > IntFibHeap;
     77  typedef FibHeap<int, Graph::NodeMap<int> > IntFibHeap;
    7878  Johnson<Graph, LengthMap>::DefStandardHeap<IntFibHeap>
    7979    ::Create fibJohnson(graph, length);
  • test/heap_test.cc

    r2260 r2269  
    8080    std::cerr << "Checking Bin Heap" << std::endl;
    8181
    82     typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
    83     checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     82    typedef BinHeap<Prio, ItemIntMap> IntHeap;
     83    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    8484    heapSortTest<IntHeap>(100);
    8585    heapIncreaseTest<IntHeap>(100);
    8686   
    87     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    88     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     87    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
     88    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    8989    Timer timer;
    9090    dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     
    9494    std::cerr << "Checking Fib Heap" << std::endl;
    9595
    96     typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
    97     checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     96    typedef FibHeap<Prio, ItemIntMap> IntHeap;
     97    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    9898    heapSortTest<IntHeap>(100);
    9999    heapIncreaseTest<IntHeap>(100);
    100100
    101     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
    102     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     101    typedef FibHeap<Prio, Graph::NodeMap<int> > NodeHeap;
     102    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    103103    Timer timer;
    104104    dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     
    108108    std::cerr << "Checking Radix Heap" << std::endl;
    109109
    110     typedef RadixHeap<Item, ItemIntMap> IntHeap;
    111     checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     110    typedef RadixHeap<ItemIntMap> IntHeap;
     111    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    112112    heapSortTest<IntHeap>(100);
    113113    heapIncreaseTest<IntHeap>(100);
    114114
    115     typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
    116     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     115    typedef RadixHeap<Graph::NodeMap<int> > NodeHeap;
     116    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    117117    Timer timer;
    118118    dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
     
    123123    std::cerr << "Checking Bucket Heap" << std::endl;
    124124
    125     typedef BucketHeap<Item, ItemIntMap> IntHeap;
    126     checkConcept<Heap<Item, Prio, ItemIntMap>, IntHeap>();
     125    typedef BucketHeap<ItemIntMap> IntHeap;
     126    checkConcept<Heap<Prio, ItemIntMap>, IntHeap>();
    127127    heapSortTest<IntHeap>(100);
    128128    heapIncreaseTest<IntHeap>(100);
    129129
    130     typedef BucketHeap<Node, Graph::NodeMap<int> > NodeHeap;
    131     checkConcept<Heap<Node, Prio, Graph::NodeMap<int> >, NodeHeap>();
     130    typedef BucketHeap<Graph::NodeMap<int> > NodeHeap;
     131    checkConcept<Heap<Prio, Graph::NodeMap<int> >, NodeHeap>();
    132132    Timer timer;
    133133    dijkstraHeapTest<Graph, LengthMap, NodeHeap>(graph, length, start);
  • test/heap_test.h

    r2242 r2269  
    2525public:
    2626  typedef std::vector<int> Parent;
     27
     28  typedef int Key;
     29  typedef int Value;
    2730
    2831  IntIntMap() : Parent() {}
Note: See TracChangeset for help on using the changeset viewer.