jar3m
diff --git a/‎Defs.make‎
Lines changed: 9 additions & 0 deletions b/‎Defs.make‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎Makefile‎
Lines changed: 7 additions & 5 deletions b/‎Makefile‎
Lines changed: 7 additions & 5 deletions
diff --git a/‎common/inc/common.h‎
Lines changed: 5 additions & 3 deletions b/‎common/inc/common.h‎
Lines changed: 5 additions & 3 deletions
diff --git a/‎common/src/common.c‎
Lines changed: 9 additions & 9 deletions b/‎common/src/common.c‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎ds/Makefile‎
Lines changed: 11 additions & 1 deletion b/‎ds/Makefile‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎ds/heap/Makefile‎
Lines changed: 15 additions & 0 deletions b/‎ds/heap/Makefile‎
Lines changed: 15 additions & 0 deletions
@@ -21,6 +21,13 @@ SEGFAULT_BACKTRACE=true
 LINK_LIST=true
 STACK=true
 QUEUE=true
+HEAP=true
+TREE=true
+
+#data struct define
+DS_FLAGS = -DLINK_LIST=$(LINK_LIST) -DSTACK=$(STACK) \
+	   -DQUEUE=$(QUEUE) -DHEAP=$(HEAP) -DTREE=$(TREE)
+
 
 .show:
 	@echo "PROJ_PATH= $(PROJ_PATH)"
@@ -30,3 +37,5 @@ QUEUE=true
 	@echo "LINK_LIST= $(LINK_LIST)"
 	@echo "STACKS= $(STACK)"
 	@echo "QUEUES= $(QUEUE)"
+	@echo "HEAPS= $(HEAP)"
+	@echo "TREES= $(TREE)"
@@ -1,9 +1,11 @@
 include Defs.make
 
 CC=gcc
+CFLAGS+=$(DS_FLAGS) 
+LDLIBS= -lm -pg 
+
 TEST_FILE_DIRECTORY="$(PROJ_PATH)/test/src"
 
-LDLIBS= -lm -pg 
 ifeq ($(SEGFAULT_BACKTRACE), true)
 LDLIBS+=-rdynamic
 endif
@@ -16,7 +18,6 @@ ds_ARCHIVE=$(PROJ_PATH)/ds/bin/ds.a
 algo_ARCHIVE=$(PROJ_PATH)/algo/bin/algo.a
 test_ARCHIVE=$(PROJ_PATH)/test/bin/test.a
 
-MODULE_ARCHIVES += $(common_ARCHIVE)
 
 ifeq ($(MODULE), ds)
 MODULE_ARCHIVES += $(ds_ARCHIVE)
@@ -27,15 +28,16 @@ MODULE_ARCHIVES += $(algo_ARCHIVE)
 endif
 
 ifeq ($(MODULE), test)
-MODULE_ARCHIVES += $(ds_ARCHIVE)
 MODULE_ARCHIVES += $(test_ARCHIVE)
+MODULE_ARCHIVES += $(ds_ARCHIVE)
 endif
 
 ifeq ($(MODULE), all)
-MODULE_ARCHIVES += $(algo_ARCHIVE)
-MODULE_ARCHIVES += $(ds_ARCHIVE)
 MODULE_ARCHIVES += $(test_ARCHIVE)
+MODULE_ARCHIVES += $(ds_ARCHIVE)
+MODULE_ARCHIVES += $(algo_ARCHIVE)
 endif
+MODULE_ARCHIVES += $(common_ARCHIVE)
 
 export
 
 
@@ -24,9 +24,11 @@ typedef struct data_params {
 	f_assign assign;		///< Routine used for creating memory for storing the data
 	f_swap swap;			///< Routine used for swaping two elemnts of goven data
 	f_free free;			///< Routine used for freeing elements of said data
-	f_cmp_idx cmp_idx;		///< Routine used for comparing elems in given array indicies
-	f_swp_idx swp_idx;              ///< Routine used for swapring elems in given array indicies	
-	f_cpy_idx cpy_idx;              ///< Routine used for copying elems in given array indicies
+
+	f_cmp_idx cmpr_idx;		///< Routine used for comparing elems in given array indicies
+	f_swp_idx swap_idx;              ///< Routine used for swapring elems in given array indicies	
+	f_cpy_idx copy_idx;              ///< Routine used for copying elems in given array indicies
+
 	f_get_idx get_idx;              ///< Routine used for getting elem in given array index
 	f_print print_data;		///< Routine used for printing elem data
 } t_dparams;
 
@@ -19,9 +19,9 @@ void init_data_params(t_dparams *prms, e_data_types data_type)
 			//char list;
 			prms->cmpr = compare_char;
 			prms->swap = swap_char;
-			prms->cmp_idx = compare_idx_char;
-			prms->swp_idx = swap_idx_char;
-			prms->cpy_idx = copy_idx_char;
+			prms->cmpr_idx = compare_idx_char;
+			prms->swap_idx = swap_idx_char;
+			prms->copy_idx = copy_idx_char;
 			prms->get_idx  = get_idx_char;
 			prms->print_data = print_char;
 			prms->free = FREE_MEM;
@@ -30,9 +30,9 @@ void init_data_params(t_dparams *prms, e_data_types data_type)
 			//int list;
 			prms->cmpr = compare_int;
 			prms->swap = swap_int;
-			prms->cmp_idx = compare_idx_int;
-			prms->swp_idx = swap_idx_int;
-			prms->cpy_idx = copy_idx_int;
+			prms->cmpr_idx = compare_idx_int;
+			prms->swap_idx = swap_idx_int;
+			prms->copy_idx = copy_idx_int;
 			prms->get_idx  = get_idx_int;
 			prms->print_data = print_int;
 			prms->free = FREE_MEM;
@@ -41,9 +41,9 @@ void init_data_params(t_dparams *prms, e_data_types data_type)
 			//float list;
 			prms->cmpr = compare_float;
 			prms->swap = swap_float;
-			prms->cmp_idx = compare_idx_float;
-			prms->swp_idx = swap_idx_float;
-			prms->cpy_idx = copy_idx_float;
+			prms->cmpr_idx = compare_idx_float;
+			prms->swap_idx = swap_idx_float;
+			prms->copy_idx = copy_idx_float;
 			prms->get_idx  = get_idx_float;
 			prms->print_data = print_float;
 			prms->free = FREE_MEM;
 
@@ -2,6 +2,8 @@
 link_list_ARCHIVE=$(PROJ_PATH)/ds/link_list/link_list.o
 stack_ARCHIVE=$(PROJ_PATH)/ds/stack/stack.o
 queue_ARCHIVE=$(PROJ_PATH)/ds/queue/queue.o
+heap_ARCHIVE=$(PROJ_PATH)/ds/heap/heap.o
+
 ds_ARCHIVE=$(PROJ_PATH)/ds/bin/ds.a
 
 export
@@ -21,10 +23,15 @@ INCLUDES += -I $(PROJ_PATH)/ds/queue/
 sub_ARCHIVE += $(queue_ARCHIVE)
 endif
 
+ifeq ($(HEAP), true)
+INCLUDES += -I $(PROJ_PATH)/ds/heap/
+sub_ARCHIVE += $(heap_ARCHIVE)
+endif
+
 all: $(ds_ARCHIVE)
-	@echo "building $(ds_ARCHIVE) from $(sub_ARCHIVE)"
 
 $(ds_ARCHIVE): $(sub_ARCHIVE)
+	@echo "building $(ds_ARCHIVE) from $(sub_ARCHIVE)"
 	ar rcs $(ds_ARCHIVE) $(sub_ARCHIVE)
 #	cp $(sub_ARCHIVE) $(ds_ARCHIVE)
 
@@ -37,6 +44,9 @@ $(stack_ARCHIVE) :
 $(queue_ARCHIVE) :
 	make -C queue/ all
 
+$(heap_ARCHIVE) :
+	make -C heap/ all
+
 clean:
 	rm -rf $(ds_ARCHIVE) $(sub_ARCHIVE)
 
 
@@ -0,0 +1,15 @@
+heap_SRC=heap.c
+heap_OBJ=heap.o
+
+OBJS=$(heap_OBJ)
+
+all: $(OBJS)
+
+$(heap_OBJ): $(heap_SRC)
+	$(CC) $(INCLUDES) -c $^ $(CFLAGS) 
+
+
+.PHONY: clean
+
+clean:
+	rm -rf $(heap_ARCHIVE) $(OBJS)