Changeset 203:215bfc30b14f in lemon-main for lemon/concepts

Timestamp:

07/11/08 15:01:49 (16 years ago)

Author:

Balazs Dezso <deba@…>

Branch:

default

Phase:

public

Message:

Cleaning of heap test and bug fix in heap concept check (ticket #100)

• The dijkstra heap test's digraph is inlined into the source file
• The random sequences are fixed
• The content of the header is moved to the source file
• Only the binary heap is checked

File:

• lemon/concepts/heap.h (modified) (3 diffs)

lemon/concepts/heap.h

@@ -182 +182 @@
           Item item;
           Prio prio;
-          State state;
           item=Item();
           prio=Prio();
           ignore_unused_variable_warning(item);
           ignore_unused_variable_warning(prio);
-          ignore_unused_variable_warning(state);
 
           OwnItem own_item;
@@ -204 +202 @@
           
           int s = heap.size();
+          ignore_unused_variable_warning(s);
           bool e = heap.empty();
+          ignore_unused_variable_warning(e);
 
           prio = heap.prio();
@@ -228 +228 @@
           heap.clear();
 
-          state = heap.state(item);
-          heap.state(item, state);
-          state = heap.state(own_item);
+          own_state = heap.state(own_item);
           heap.state(own_item, own_state);
 
-          state = _Heap::PRE_HEAP;
-          state = _Heap::IN_HEAP;
-          state = _Heap::POST_HEAP;
           own_state = _Heap::PRE_HEAP;
           own_state = _Heap::IN_HEAP;