Merge branch 'sli' into 'master'

Rebase and rebase

See merge request !3

LibList/CellElement.c

@@ -1,14 +1,122 @@
-/*
+/***
-* @Author: klmp200
+--- CellElemFunc ---
-* @Date:   2016-12-10 01:32:50
+---Created by : Naej Doree ---
-* @Last Modified by:   klmp200
+***/
-* @Last Modified time: 2016-12-10 04:29:48
-*/
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <CellElement.h>
 
+
+cellElement * CreateCellElem(){
+	cellElement * elem = NULL;
+	elem = (cellElement*) malloc(sizeof(cellElement));
+
+	if (elem == NULL){
+		return NULL;
+	}
+
+	printf("---Created cellElement---\n");
+
+	elem->value = true;
+	elem->nextCol = NULL;
+	elem->nextRow = NULL;
+
+
+	return elem;
+}
+
+void freeCellElem(cellElement * elem){
+	free(elem);
+	elem = NULL;
+}
+
+int AddNextCol(cellElement* tree){
+
+	cellElement * elem = NULL;
+	elem = (cellElement*) malloc(sizeof(cellElement));
+
+	if (elem == NULL){
+		return -1;
+	}
+
+	printf("---insertNextCol---\n");
+
+	elem->value = true;
+	elem->nextCol = NULL;
+	elem->nextRow = NULL;
+
+	if (tree->nextCol == NULL){
+		tree->nextCol = elem;
+	}else{
+		return -2;
+	}
+
+	return 1;
+}
+
+
+int AddNextRow(cellElement* tree){
+
+	cellElement * elem = NULL;
+	elem = (cellElement*) malloc(sizeof(cellElement));
+
+	if (elem == NULL){
+		return -1;
+	}
+
+	printf("---insertNextRow---\n");
+
+	elem->value = true;
+	elem->nextRow = NULL;
+	elem->nextRow = NULL;
+	if (tree->nextRow == NULL){
+		tree->nextRow = elem;
+	}else{
+		return -2;
+	}
+	return 1;
+}
+
+void removeNextCol(cellElement* tree){
+	printf("---removeNextCol---\n");
+
+	if (tree->nextCol != NULL){
+		cellElement * elem = tree->nextCol;
+		free(elem);
+		elem = NULL;
+		tree->nextCol = NULL;
+	}
+
+}
+
+void removeNextRow(cellElement* tree){
+	printf("---removeNextRow---\n");
+
+	if (tree->nextRow != NULL){
+		cellElement* elem = tree->nextRow;
+		free(elem);
+		elem =NULL;
+		tree->nextRow = NULL;
+	}
+
+}
+void recursivePrint(cellElement * tree){
+	if (tree != NULL){
+		printf("Elem : x: %d  y: %d \n",tree->colIndex,tree->rowIndex);
+		if (tree->nextCol != NULL){
+			recursivePrint(tree->nextCol);
+		}
+		if (tree->nextRow != NULL){
+			recursivePrint(tree->nextRow);
+		}
+		if (tree->nextCol == NULL && tree->nextCol == NULL){
+			printf("leaf\n");
+		}
+
+	}
+}
+
 void FreeCellElement(cellElement* element) {
 	if (element != NULL){
 		free(element);

LibList/CellElement.h

@@ -37,8 +37,18 @@ struct cellElement {
 	struct cellElement * nextRow;
 
 };
-typedef struct cellElement * cellElement;
+typedef struct cellElement cellElement;
 
+cellElement * CreateCellElem();
+void freeCellElem(cellElement * elem);
+
+int AddNextCol(cellElement* tree);
+int AddNextRow(cellElement* tree);
+
+void removeNextCol(cellElement* list);
+void removeNextRow(cellElement* list);
+
+void recursivePrint(cellElement * tree);
 
 void FreeCellElement(cellElement* element);
 

Makefile

@@ -17,15 +17,14 @@ SOURCECFILE=$(SOURCE:=.c)
 SOURCEOFILE=$(SOURCE:=.o)
 
 #Library variables
-DEPENDENCE=libCellElement.so
+# DEPENDENCE=libCellElement.so
-DEPENDENCENAME=CellElement
+# DEPENDENCENAME=CellElement
 
 DEPENDENCELIST=libList.so
 DEPENDENCENAMELIST=List
 
 
 all: $(TARGET)
-
 #Generating the main.exe
 $(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib
 	@echo "\n Generating the " $(TARGET) " binary"
@@ -35,7 +34,7 @@ $(TARGET): $(SOURCEOFILE) $(DEPENDENCELIST) lib
 lib:
 	@echo "\n Generating the automaton library binary"
 	mkdir -p Libs
-	$(MAKE) -C LibCell
+	# $(MAKE) -C LibCell
 
 $(DEPENDENCELIST):
 	@echo "\n Generating the list library binary"
@@ -54,4 +53,3 @@ clean:
 	rm -rf *.o ./Libs/*.so *.exe
 	$(MAKE) -C LibCell clean
 	$(MAKE) -C LibList clean
-

main.c

@@ -8,9 +8,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <CellElement.h>
+
+int main(int argc, char **argv){
+	cellElement * tree = NULL;
+	tree = CreateCellElem();
+	tree->colIndex = 1;
+	AddNextRow(tree);
+	tree->nextRow->colIndex = 2;
+	AddNextCol(tree);
+	tree->nextCol->colIndex = 3;
+	recursivePrint(tree);
+	removeNextRow(tree);
+	removeNextCol(tree);
+	recursivePrint(tree);
 
-int main(int argc, char *argv[])
-{
-	printf("Hello World\n");
 	return 0;
+
 }