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

Timestamp:

03/09/05 15:10:21 (19 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:

• src/test/heap_test.cc (modified) (6 diffs)

src/test/heap_test.cc

@@ -7 +7 @@
 #include <lemon/concept_check.h>
 
+#include <lemon/smart_graph.h>
+
+#include <lemon/graph_reader.h>
+
 #include <lemon/bin_heap.h>
 #include <lemon/fib_heap.h>
 #include <lemon/radix_heap.h>
 
-#include <lemon/dimacs.h>
+#include "test_tools.h"
 
-#include "test_tools.h"
 #include "heap_test.h"
-#include "map_test.h"
 
 
@@ -32 +34 @@
       Prio prio;
 
+      ignore_unused_variable_warning(item);
+      ignore_unused_variable_warning(prio);
+
       typedef typename _Heap::state_enum state_enum;
       state_enum state;
+
+      ignore_unused_variable_warning(state);
       
       _Heap heap1 = _Heap(map);
+
+      ignore_unused_variable_warning(heap1);
       
       heap.push(item, prio);
@@ -81 +90 @@
   Node start;
 
-  std::ifstream input("preflow_graph.dim");
-  readDimacs(input, graph, length, start);  
+  /// \todo create own test graph
+  std::ifstream input("dijkstra_test.lemon");
+  readGraph(input, graph, length, start);  
  
   {
@@ -89 +99 @@
     typedef BinHeap<Item, Prio, ItemIntMap> IntHeap;
     checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>(20);
+    heapSortTest<IntHeap>(100);
+    heapIncreaseTest<IntHeap>(100);
     
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
@@ -100 +111 @@
     typedef FibHeap<Item, Prio, ItemIntMap> IntHeap;
     checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>(20);
+    heapSortTest<IntHeap>(100);
+    heapIncreaseTest<IntHeap>(100);
 
     typedef FibHeap<Node, Prio, Graph::NodeMap<int> > NodeHeap;
@@ -111 +123 @@
     typedef RadixHeap<Item, ItemIntMap> IntHeap;
     checkConcept<HeapConcept<Item, Prio, ItemIntMap>, IntHeap>();
-    heapSortTest<IntHeap>(20);
+    heapSortTest<IntHeap>(100);
+    heapIncreaseTest<IntHeap>(100);
 
     typedef RadixHeap<Node, Graph::NodeMap<int> > NodeHeap;