Code style improvements

include/2darray.h

@@ -10,8 +10,8 @@
  * Simulated by 1-dimension array.
  ******************************************************************************/
 
-#ifndef __2D_ARRAY_H__
-#define __2D_ARRAY_H__
+#ifndef ALGO_2D_ARRAY_H__
+#define ALGO_2D_ARRAY_H__
 #include <stdint.h>
 #include <stdlib.h>
 

include/8queen.h

@@ -9,8 +9,8 @@
  * http://en.wikipedia.org/wiki/Eight_queens_puzzle
  ******************************************************************************/
 
-#ifndef __8QUEEN_H__
-#define __8QUEEN_H__
+#ifndef ALGO_8QUEEN_H__
+#define ALGO_8QUEEN_H__
 
 #include <stdio.h>
 #include <string.h>
@@ -84,4 +84,4 @@ namespace alg {
 	};
 }
 
-#endif //__8QUEEN_H__
+#endif //ALGO_8QUEEN_H__

include/astar.h

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 
-#ifndef __ASTAR_H__
-#define __ASTAR_H__
+#ifndef ALGO_ASTAR_H__
+#define ALGO_ASTAR_H__
 
 #include <stdlib.h>
 #include <stdint.h>

include/avl.h

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 
-#ifndef __AVL_H__
-#define __AVL_H__
+#ifndef ALGO_AVL_H__
+#define ALGO_AVL_H__
 
 #include <iostream>
 #include <cmath>

include/bellman_ford.h

@@ -44,8 +44,8 @@
  * 
  ******************************************************************************/
 
-#ifndef __BELLMAN_FORD_H__
-#define __BELLMAN_FORD_H__
+#ifndef ALGO_BELLMAN_FORD_H__
+#define ALGO_BELLMAN_FORD_H__
 
 #include <stdio.h>
 #include <stdlib.h>

include/binary_search_tree.h

@@ -18,8 +18,8 @@
  *
  ******************************************************************************/
 
-#ifndef __BINARY_SEARCH_TREE_H__
-#define __BINARY_SEARCH_TREE_H__
+#ifndef ALGO_BINARY_SEARCH_TREE_H__
+#define ALGO_BINARY_SEARCH_TREE_H__
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -57,7 +57,7 @@ namespace alg {
 				BST():m_root(NULL){};
 
 				~BST() {
-					__destruct(m_root);
+					destruct_(m_root);
 				}
 
 				/**
@@ -159,10 +159,10 @@ namespace alg {
 				}
 
 			private:
-				void __destruct(treeNode *n) {
+				void destruct_(treeNode *n) {
 					if (n==NULL) return;
-					__destruct(n->left);
-					__destruct(n->right);
+					destruct_(n->left);
+					destruct_(n->right);
 					delete n;
 				}
 

include/bitset.h

@@ -11,8 +11,8 @@
  *
  ******************************************************************************/
 
-#ifndef __BIT_SET_H__
-#define __BIT_SET_H__
+#ifndef ALGO_BIT_SET_H__
+#define ALGO_BIT_SET_H__
 
 #include <stdlib.h>
 #include <stdint.h>

include/bloom_filter.h

@@ -18,8 +18,8 @@
  * 
  ******************************************************************************/
 
-#ifndef __BLOOM_FILTER_H__
-#define __BLOOM_FILTER_H__
+#ifndef ALGO_BLOOM_FILTER_H__
+#define ALGO_BLOOM_FILTER_H__
 
 #include <stdint.h>
 #include <stdbool.h>

include/btree.h

@@ -24,8 +24,8 @@
  * http://en.wikipedia.org/wiki/B-tree
  ******************************************************************************/
 
-#ifndef __BTREE_H__
-#define __BTREE_H__
+#ifndef ALGO_BTREE_H__
+#define ALGO_BTREE_H__
 
 #include <stdio.h>
 #include <assert.h>

include/dijkstra.h

@@ -19,8 +19,8 @@
  *
  ******************************************************************************/
 
-#ifndef __DIJKSTRA_H__
-#define __DIJKSTRA_H__
+#ifndef ALGO_DIJKSTRA_H__
+#define ALGO_DIJKSTRA_H__
 
 #include <stdio.h>
 #include <stdlib.h>

include/directed_graph.h

@@ -14,8 +14,8 @@
  *
  ******************************************************************************/
 
-#ifndef __DIRECTED_GRAPH_H__
-#define __DIRECTED_GRAPH_H__
+#ifndef ALGO_DIRECTED_GRAPH_H__
+#define ALGO_DIRECTED_GRAPH_H__
 
 #include <stdio.h>
 #include <stdlib.h>

include/disjoint-set.h

@@ -18,8 +18,8 @@
  * http://en.wikipedia.org/wiki/Disjoint-set_data_structure
  ******************************************************************************/
 
-#ifndef __DISJOINTSET_H__
-#define __DISJOINTSET_H__
+#ifndef ALGO_DISJOINTSET_H__
+#define ALGO_DISJOINTSET_H__
 
 namespace alg {
 	template<typename T>

include/dos_tree.h

@@ -16,8 +16,8 @@
  *
  ******************************************************************************/
 
-#ifndef __DOS_TREE_H__
-#define __DOS_TREE_H__
+#ifndef ALGO_DOS_TREE_H__
+#define ALGO_DOS_TREE_H__
 
 #include <stdlib.h>
 #include <assert.h>

include/double_linked_list.h

@@ -16,8 +16,8 @@
  * http://en.wikipedia.org/wiki/Double_linked_list
  ******************************************************************************/
 
-#ifndef __DOUBLE_LINKED_LIST_H__
-#define __DOUBLE_LINKED_LIST_H__
+#ifndef ALGO_DOUBLE_LINKED_LIST_H__
+#define ALGO_DOUBLE_LINKED_LIST_H__
 
 struct list_head {
 	struct list_head *next, *prev;
@@ -39,7 +39,7 @@ struct list_head {
  * the prev/next entries already!
  */
 static inline void 
-__list_add(struct list_head *n,
+list_add_(struct list_head *n,
 			      struct list_head *prev,
 			      struct list_head *next)
 {
@@ -57,14 +57,14 @@ __list_add(struct list_head *n,
  * the prev/next entries already!
  */
 static inline void 
-__list_del(struct list_head *prev, struct list_head *next)
+list_del_(struct list_head *prev, struct list_head *next)
 {
 	next->prev = prev;
 	prev->next = next;
 }
 
 static inline void 
-__list_splice(struct list_head *list, struct list_head *head)
+list_splice_(struct list_head *list, struct list_head *head)
 {
 	struct list_head *first = list->next;
 	struct list_head *last = list->prev;
@@ -88,7 +88,7 @@ __list_splice(struct list_head *list, struct list_head *head)
 static inline void 
 list_add(struct list_head *n, struct list_head *head)
 {
-	__list_add(n, head, head->next);
+	list_add_(n, head, head->next);
 }
 
 /**
@@ -102,7 +102,7 @@ list_add(struct list_head *n, struct list_head *head)
 static inline void 
 list_add_tail(struct list_head *n, struct list_head *head)
 {
-	__list_add(n, head->prev, head);
+	list_add_(n, head->prev, head);
 }
 
 /**
@@ -113,7 +113,7 @@ list_add_tail(struct list_head *n, struct list_head *head)
 static inline void 
 list_del(struct list_head *entry)
 {
-	__list_del(entry->prev, entry->next);
+	list_del_(entry->prev, entry->next);
 	entry->next = NULL;
 	entry->prev = NULL;
 }
@@ -125,7 +125,7 @@ list_del(struct list_head *entry)
 static inline void 
 list_del_init(struct list_head *entry)
 {
-	__list_del(entry->prev, entry->next);
+	list_del_(entry->prev, entry->next);
 	INIT_LIST_HEAD(entry); 
 }
 
@@ -137,7 +137,7 @@ list_del_init(struct list_head *entry)
 static inline void 
 list_move(struct list_head *list, struct list_head *head)
 {
-        __list_del(list->prev, list->next);
+        list_del_(list->prev, list->next);
         list_add(list, head);
 }
 
@@ -149,7 +149,7 @@ list_move(struct list_head *list, struct list_head *head)
 static inline void 
 list_move_tail(struct list_head *list, struct list_head *head)
 {
-        __list_del(list->prev, list->next);
+        list_del_(list->prev, list->next);
         list_add_tail(list, head);
 }
 
@@ -172,7 +172,7 @@ static inline void
 list_splice(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list))
-		__list_splice(list, head);
+		list_splice_(list, head);
 }
 
 /**
@@ -186,7 +186,7 @@ static inline void list_splice_init(struct list_head *list,
 				    struct list_head *head)
 {
 	if (!list_empty(list)) {
-		__list_splice(list, head);
+		list_splice_(list, head);
 		INIT_LIST_HEAD(list);
 	}
 }

include/edmonds_karp.h

@@ -21,8 +21,8 @@
  *
  ******************************************************************************/
 
-#ifndef __EDMONDS_KARP_H__
-#define __EDMONDS_KARP_H__
+#ifndef ALGO_EDMONDS_KARP_H__
+#define ALGO_EDMONDS_KARP_H__
 
 #include <stdlib.h>
 #include <stdint.h>

include/fenwick_tree.h

@@ -14,8 +14,8 @@
  *
  ******************************************************************************/
 
-#ifndef __FENWICK_H__
-#define __FENWICK_H__
+#ifndef ALGO_FENWICK_H__
+#define ALGO_FENWICK_H__
 
 #include <vector>
 

include/fib-heap.h

@@ -17,8 +17,8 @@
  * http://en.wikipedia.org/wiki/Fibonacci_heap
  ******************************************************************************/
 
-#ifndef __FIB_HEAP_H__
-#define __FIB_HEAP_H__
+#ifndef ALGO_FIB_HEAP_H__
+#define ALGO_FIB_HEAP_H__
 #include <math.h>
 #include <stdint.h>
 #include <unistd.h>

include/generic.h

@@ -9,8 +9,8 @@
  *
  ******************************************************************************/
 
-#ifndef __ALG_INC_H__
-#define __ALG_INC_H__
+#ifndef ALGO_ALG_INC_H__
+#define ALGO_ALG_INC_H__
 #include <stdio.h>
 #include <stdint.h>
 #include <assert.h>

include/graph_defs.h

@@ -1,5 +1,5 @@
-#ifndef __GRAPH_DEFS_H__
-#define __GRAPH_DEFS_H__
+#ifndef ALGO_GRAPH_DEFS_H__
+#define ALGO_GRAPH_DEFS_H__
 
 #include "double_linked_list.h"
 

include/graph_search.h

@@ -20,8 +20,8 @@
  *
  ******************************************************************************/
 
-#ifndef __BREADTH_FIRST_SEARCH_H__
-#define __BREADTH_FIRST_SEARCH_H__
+#ifndef ALGO_BREADTH_FIRST_SEARCH_H__
+#define ALGO_BREADTH_FIRST_SEARCH_H__
 
 #include <stdio.h>
 #include <stdint.h>

include/hash_code.h

@@ -1,5 +1,5 @@
-#ifndef __HASH_CODE_H__
-#define __HASH_CODE_H__
+#ifndef ALGO_HASH_CODE_H__
+#define ALGO_HASH_CODE_H__
 #include <string.h>
 #include "hash_string.h"
 namespace alg {

include/hash_multi.h

@@ -15,8 +15,8 @@
  *
  ******************************************************************************/
 
-#ifndef __HASH_MULTIPLICATION_H__
-#define __HASH_MULTIPLICATION_H__
+#ifndef ALGO_HASH_MULTIPLICATION_H__
+#define ALGO_HASH_MULTIPLICATION_H__
 
 #include <math.h>
 #include <string.h>

include/hash_string.h

@@ -12,8 +12,8 @@
  *
  ******************************************************************************/
 
-#ifndef __STRING_HASH_H__
-#define __STRING_HASH_H__
+#ifndef ALGO_STRING_HASH_H__
+#define ALGO_STRING_HASH_H__
 
 #include <stdint.h>
 

include/hash_table.h

@@ -14,8 +14,8 @@
  *
  ******************************************************************************/
 
-#ifndef __HASH_TABLE_H__
-#define __HASH_TABLE_H__
+#ifndef ALGO_HASH_TABLE_H__
+#define ALGO_HASH_TABLE_H__
 
 #include <stdint.h>
 #include <string.h>

include/heap.h

@@ -28,8 +28,8 @@
  * http://en.wikipedia.org/wiki/Binary_heap
  ******************************************************************************/
 
-#ifndef __HEAP_H__
-#define __HEAP_H__
+#ifndef ALGO_HEAP_H__
+#define ALGO_HEAP_H__
 
 #include <stdio.h>
 #include <stdlib.h>