COIN-OR::LEMON - Graph Library

Changeset 1206:9c398137c2cb in lemon-0.x for src/test/heap_test.cc


Ignore:
Timestamp:
03/09/05 15:10:21 (16 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1625
Message:

Increase test
Changing test graph

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/test/heap_test.cc

    r1187 r1206  
    77#include <lemon/concept_check.h>
    88
     9#include <lemon/smart_graph.h>
     10
     11#include <lemon/graph_reader.h>
     12
    913#include <lemon/bin_heap.h>
    1014#include <lemon/fib_heap.h>
    1115#include <lemon/radix_heap.h>
    1216
    13 #include <lemon/dimacs.h>
     17#include "test_tools.h"
    1418
    15 #include "test_tools.h"
    1619#include "heap_test.h"
    17 #include "map_test.h"
    1820
    1921
     
    3234      Prio prio;
    3335
     36      ignore_unused_variable_warning(item);
     37      ignore_unused_variable_warning(prio);
     38
    3439      typedef typename _Heap::state_enum state_enum;
    3540      state_enum state;
     41
     42      ignore_unused_variable_warning(state);
    3643     
    3744      _Heap heap1 = _Heap(map);
     45
     46      ignore_unused_variable_warning(heap1);
    3847     
    3948      heap.push(item, prio);
     
    8190  Node start;
    8291
    83   std::ifstream input("preflow_graph.dim");
    84   readDimacs(input, graph, length, start); 
     92  /// \todo create own test graph
     93  std::ifstream input("dijkstra_test.lemon");
     94  readGraph(input, graph, length, start); 
    8595 
    8696  {
     
    8999    typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
    90100    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
    91     heapSortTest<IntHeap>(20);
     101    heapSortTest<IntHeap>(100);
     102    heapIncreaseTest<IntHeap>(100);
    92103   
    93104    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
     
    100111    typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
    101112    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
    102     heapSortTest<IntHeap>(20);
     113    heapSortTest<IntHeap>(100);
     114    heapIncreaseTest<IntHeap>(100);
    103115
    104116    typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
     
    111123    typedef RadixHeap<Item, ItemIntMap> IntHeap;
    112124    checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
    113     heapSortTest<IntHeap>(20);
     125    heapSortTest<IntHeap>(100);
     126    heapIncreaseTest<IntHeap>(100);
    114127
    115128    typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;
Note: See TracChangeset for help on using the changeset viewer.