# HG changeset patch
# User Alpar Juttner <alpar@cs.elte.hu>
# Date 1226744848 0
# Node ID 7951042b9e537353cb38f2a8cbb461a325c266cb
# Parent fa7562ef5f8e2bd8fb1cd7bb159c0a727e06dd8e
Rename markToBottom() to dirtyTopButOne() + doc improvements
diff --git a/lemon/elevator.h b/lemon/elevator.h
|
a
|
b
|
|
| 380 | 380 | if(new_level>_highest_active) _highest_active=new_level; |
| 381 | 381 | } |
| 382 | 382 | |
| 383 | | ///Mark the node as it did not reach the max level |
| | 383 | ///Move an inactive item to the top but one level (in a dirty way). |
| 384 | 384 | |
| 385 | | ///Mark the node as it did not reach the max level. It sets the |
| 386 | | ///level to the under the max level value. The node will be never |
| 387 | | ///more activated because the push operation from the maximum |
| 388 | | ///level is forbidden in the push-relabel algorithms. The node |
| 389 | | ///should be lifted previously to the top level. |
| 390 | | void markToBottom(Item i) { |
| | 385 | ///This function moves an inactive item to the top but one level. |
| | 386 | ///It makes the underlying datastructure corrupt, so use is only if |
| | 387 | ///you really know what it is for. |
| | 388 | ///\pre The item is on the top level. |
| | 389 | void dirtyTopButOne(Item i) { |
| 391 | 390 | _level[i] = _max_level - 1; |
| 392 | 391 | } |
| 393 | 392 | |
| 394 | | ///Lift all nodes on and above a level to the top (and deactivate them). |
| | 393 | ///Lift all items on and above a level to the top (and deactivate them). |
| 395 | 394 | |
| 396 | | ///This function lifts all nodes on and above level \c l to \c |
| | 395 | ///This function lifts all items on and above level \c l to \c |
| 397 | 396 | ///maxLevel(), and also deactivates them. |
| 398 | 397 | void liftToTop(int l) |
| 399 | 398 | { |
| … |
… |
|
| 749 | 748 | ///Lift the highest active to top. |
| 750 | 749 | |
| 751 | 750 | ///Lift the item returned by highestActive() to the top level and |
| 752 | | ///deactivates the node. |
| | 751 | ///deactivates the item. |
| 753 | 752 | /// |
| 754 | 753 | void liftHighestActiveToTop() { |
| 755 | 754 | Item i = _first[_highest_active]; |
| … |
… |
|
| 897 | 896 | } |
| 898 | 897 | } |
| 899 | 898 | |
| 900 | | ///Mark the node as it did not reach the max level |
| | 899 | ///Move an inactive item to the top but one level (in a dirty way). |
| 901 | 900 | |
| 902 | | ///Mark the node as it did not reach the max level. It sets the |
| 903 | | ///level to the under the max level value. The node will be never |
| 904 | | ///more activated because the push operation from the maximum |
| 905 | | ///level is forbidden in the push-relabel algorithms. The node |
| 906 | | ///should be lifted previously to the top level. |
| 907 | | void markToBottom(Item i) { |
| | 901 | ///This function moves an inactive item to the top but one level. |
| | 902 | ///It makes the underlying datastructure corrupt, so use is only if |
| | 903 | ///you really know what it is for. |
| | 904 | ///\pre The item is on the top level. |
| | 905 | void dirtyTopButOne(Item i) { |
| 908 | 906 | _level.set(i, _max_level - 1); |
| 909 | 907 | } |
| 910 | 908 | |
| 911 | | ///Lift all nodes on and above a level to the top (and deactivate them). |
| | 909 | ///Lift all items on and above a level to the top (and deactivate them). |
| 912 | 910 | |
| 913 | | ///This function lifts all nodes on and above level \c l to \c |
| | 911 | ///This function lifts all items on and above level \c l to \c |
| 914 | 912 | ///maxLevel(), and also deactivates them. |
| 915 | 913 | void liftToTop(int l) { |
| 916 | 914 | for (int i = l + 1; _first[i] != INVALID; ++i) { |
