updated tests

Author: aladdinpersson

Algorithm_tests/graphtheory_tests/bellman_ford_test.py

@@ -9,16 +9,9 @@
 # If run from local:
 #sys.path.append('../../Algorithms/graphtheory/bellman-ford')
 
-from bellman_ford import bellman_ford, make_graph
+from bellman_ford import bellman_ford
 
 class test_BellmanFord(unittest.TestCase):
-
-    def test_loadgraph(self):
-        correct_graph = {1: {2: 5, 3: 10}, 2: {4: -5}, 3: {4: 15}}
-        graph = make_graph('Algorithm_tests/graphtheory_tests/test_graph.txt')
-
-        self.assertEqual(graph, correct_graph)
-
     def test_loadmissingfile(self):
         with self.assertRaises(IOError):
             graph = make_graph('this_file_doesnt_exist.txt')

Algorithms/graphtheory/dijkstra/dijkstra.py

@@ -1,26 +1,20 @@
 '''
-Dijkstra's algorithm for finding the shortest path in a graph
+Dijkstra's algorithm for finding the shortest path in a graph, this implementation
+is a naive implementation, check my Heap implementation for a more efficient algorithm
 
 Programmed by Aladdin Persson <aladdin.persson at hotmail dot com>
     2019-01-28 Initial programming
     2020-03-28 Cleaned up code
 '''
 
-def make_graph(file):
-    try:
-        f = open(file, 'r')
-    except IOError:
-        raise("File does not exist!")
-
-    line_list = f.readlines()
-
-    G = {int(line.split()[0]): {(int(tup.split(',')[0])): int(tup.split(',')[1])
-                                for tup in line.split()[1:] if tup} for line in line_list if line}
-
-    f.close()
-    return G
-
 def dijkstra(G, start, end):
+    '''
+    :param G: {from_node1: {to_node1:cost1, to_node2:cost2}, from_node2 : {.., etc.}, ...}
+    :param start: starting node
+    :param end: ending node where we want to find path to
+    :return: path from starting node to end node and the cost to get between them
+    '''
+
     if start not in G or end not in G:
         return [], float('inf')
 
@@ -70,8 +64,6 @@ def dijkstra(G, start, end):
 
 
 if __name__ == '__main__':
-    #G = make_graph('dijkstraData.txt')
-
     G =  {1:{2:10, 3:20},
           2:{4:40},
           3:{4:5},