1 files changed, 44 insertions, 32 deletions

diff --git a/sem3/algo/workshop2/dijkstra/graph.c b/sem3/algo/workshop2/dijkstra/graph.c
index 3f24ccf..51206c4 100644
--- a/sem3/algo/workshop2/dijkstra/graph.c
+++ b/sem3/algo/workshop2/dijkstra/graph.c
@@ -6,9 +6,10 @@
 #include "graph.h"
 
 // Hashtable
-static unsigned int hash(char *s) {
+static unsigned int hash(char *s)
+{
 	uint32_t hv = 0;
-	for( int i = 0; s[i] != '\0'; i++ ) {
+	for ( int i = 0; s[i] != '\0'; i++ ) {
 		// take MSB 6 bits of hv and xors with LSB of s[i]
 		uint32_t v = ( hv >> 26 ) ^ (s[i] & 0x3f);
 
@@ -20,7 +21,8 @@ static unsigned int hash(char *s) {
 }
 
 
-static void table_insert(graph_t *g, vertex_t *v, char *var) {
+static void table_insert(graph_t *g, vertex_t *v, char *var)
+{
 	unsigned int index = hash(var);
 
 	// Save old value
@@ -33,19 +35,21 @@ static void table_insert(graph_t *g, vertex_t *v, char *var) {
 	g->hashtable[index]->next = oldSym;
 }
 
-static vertex_t *table_lookup(graph_t *g, char *var) {
+static vertex_t *table_lookup(graph_t *g, char *var)
+{
 	unsigned int index = hash(var);
 	vertex_t *n = g->hashtable[index];
 
 	// Look trough list
-	while(n != NULL && strcmp(n->ref, var) != 0) {
+	while (n != NULL && strcmp(n->ref, var) != 0) {
 		n = n->next;
 	}
 
 	return n;
 }
 
-static vertex_t *create_vertex(char *ref) {
+static vertex_t *create_vertex(char *ref)
+{
 	// Get some space TODO check for null
 	vertex_t *v = malloc(sizeof(vertex_t));
 
@@ -58,7 +62,8 @@ static vertex_t *create_vertex(char *ref) {
 	return v;
 }
 
-static edge_t *create_edge(vertex_t *from, vertex_t *to, int weight) {
+static edge_t *create_edge(vertex_t *from, vertex_t *to, int weight)
+{
 	edge_t *old = from->adj;
 
 	// Create new list node
@@ -69,12 +74,12 @@ static edge_t *create_edge(vertex_t *from, vertex_t *to, int weight) {
 
 	// Do new link
 	e->next = old;
-	if( old ) {
+	if ( old ) {
 		e->prev = old->prev;
 		old->prev = e;
 	} else { e->prev = NULL; }
 	
-	if( e->prev ) {
+	if ( e->prev ) {
 		e->prev->next = e;
 	}
 
@@ -84,16 +89,17 @@ static edge_t *create_edge(vertex_t *from, vertex_t *to, int weight) {
 }
 
 // For iterating edges
-edge_t *edge_next(graph_t *g, edge_t *e) {
-	if(e == NULL || e->next == NULL ) {
+edge_t *edge_next(graph_t *g, edge_t *e)
+{
+	if (e == NULL || e->next == NULL ) {
 		// Find next index
 		vertex_t *v = e ? e->from : NULL;
 
 		// Find next vertex
 		v = vertex_next(g, v);
-		while( v ) {
+		while ( v ) {
 			// Check if found
-			if( v->adj ) {
+			if ( v->adj ) {
 				return v->adj;
 			}
 
@@ -108,12 +114,13 @@ edge_t *edge_next(graph_t *g, edge_t *e) {
 	return e->next;
 }
 
-vertex_t *vertex_next(graph_t *g, vertex_t *v) {
-	if( v == NULL || v->next == NULL) {
+vertex_t *vertex_next(graph_t *g, vertex_t *v)
+{
+	if ( v == NULL || v->next == NULL) {
 		// Go to next index in hashtable
 		int i = v ? hash(v->ref)+1 : 0;
-		for( ; i < HASHSIZE; i++) {
-			if( g->hashtable[i] ) {
+		for ( ; i < HASHSIZE; i++) {
+			if ( g->hashtable[i] ) {
 				return g->hashtable[i];
 			}
 		}
@@ -125,15 +132,16 @@ vertex_t *vertex_next(graph_t *g, vertex_t *v) {
 	return v->next;
 }
 
-void graph_edge(graph_t *g, char *from, char *to, int weight) {
+void graph_edge(graph_t *g, char *from, char *to, int weight)
+{
 	vertex_t *fromv, *tov;
 	// Does a exists
-	if( (fromv = table_lookup(g, from)) == NULL ) {
+	if ( (fromv = table_lookup(g, from)) == NULL ) {
 		fromv = create_vertex(from);
 		table_insert(g, fromv, from);
 	}
 	// What about b
-	if( (tov = table_lookup(g, to)) == NULL ) {
+	if ( (tov = table_lookup(g, to)) == NULL ) {
 		tov = create_vertex(to);
 		table_insert(g, tov, to);
 	}
@@ -142,15 +150,16 @@ void graph_edge(graph_t *g, char *from, char *to, int weight) {
 	create_edge(fromv, tov, weight);
 }
 
-int graph_print_adj(graph_t *g, char *ref) {
+int graph_print_adj(graph_t *g, char *ref)
+{
 	vertex_t *v = table_lookup(g, ref);
-	if( v == NULL ) {
+	if ( v == NULL ) {
 		return 1;
 	}
 	
 	edge_t *e = v->adj;
 	printf("[ ");
-	while(e && e->from->ref == ref) {
+	while (e && e->from->ref == ref) {
 		printf("%s[%d] ", e->to->ref, e->weight);
 		e = e->next;
 	}
@@ -159,19 +168,20 @@ int graph_print_adj(graph_t *g, char *ref) {
 	return 0;
 }
 
-int graph_to_dot(FILE *f, graph_t *g) {
+int graph_to_dot(FILE *f, graph_t *g)
+{
 	// print pre stuff
 	fprintf(f, "digraph coolgraph {\n");
 
 	// Label all nodes
 	vertex_t *v = vertex_next(g, NULL);
-	while( v ) {
+	while ( v ) {
 		fprintf(f, "%s [label=\"%s(%d)\"];\n", v->ref, v->ref, v->dist);
 		v = vertex_next(g, v);
 	}
 	// Print all the edges
 	edge_t *e = edge_next(g, NULL);
-	while( e ) {
+	while ( e ) {
 		fprintf(f, "%s -> %s [label = %d%s];\n", e->from->ref, e->to->ref, e->weight, e->to->p == e->from ? " color=blue" : "");
 		e = edge_next(g, e);
 	}
@@ -181,26 +191,27 @@ int graph_to_dot(FILE *f, graph_t *g) {
 }
 
 // This was created in a hurry sorry
-int graph_from_dot(FILE *f, graph_t *g) {
+int graph_from_dot(FILE *f, graph_t *g)
+{
 	char from[100], to[100];
 	int weight;
 	int count = 0;
 	// just fscanf it
-	for(;;) {
+	for (;;) {
 		// Set first to zero
 		*from = 0;
 		*to = 0;
 		weight = 0;
 		int c = fscanf(f, "%s -> %s [label=%d];", from, to, &weight);
-		if( c <= 0 ) {
+		if ( c <= 0 ) {
 			break;
 		}
-		if( *from == 0 || *to == 0 ) {
+		if ( *from == 0 || *to == 0 ) {
 			continue;
 		}
 		// Sorry i just want it to work
 		int tolen = strlen(to);
-		if( to[tolen-1] == ';' ) {
+		if ( to[tolen-1] == ';' ) {
 			to[tolen-1] = 0;
 		}
 
@@ -214,6 +225,7 @@ int graph_from_dot(FILE *f, graph_t *g) {
 	return count;
 }
 
-vertex_t *graph_vertex(graph_t *g, char *ref) {
+vertex_t *graph_vertex(graph_t *g, char *ref)
+{
 	return table_lookup(g, ref);
 }