Committing to work across machines

Main.hs

@@ -3,13 +3,20 @@ module Main where
 import GraphTheory.Graph
 import GraphTheory.SpecialGraphs
 import qualified Data.Map as M
-
-infinity = 1/0
+import Data.Maybe (fromJust)
 
 g1 :: Graph Integer Integer
 g1 = uwGraph [1, 2, 3, 4, 5, 6] [((1,2),0), ((3,2),0),((5,3),6),((4,1),10),((5,6),1)]
 
---dijkstra :: Graph v e -> [(v,e)]
---dijkstra g = dijkstra' g (Hash.new (==) (Hash.hashString . show))
+dijkstra :: (Integral e, Bounded e, Ord v) => Graph v e -> [(v,e)]
+dijkstra g = dijkstra' g (infTable g) []
+
+infTable :: (Integral e, Bounded e, Ord v) => Graph v e -> M.Map v e
+infTable g = foldl (\m v -> M.insert v maxBound m) M.empty (vertices g)
+
+dijkstra' :: (Integral e, Ord v) => Graph v e -> M.Map v e -> [v] -> [(v,e)]
+dijkstra' g l t
+    | M.size l == length (vertices g) = map (\v -> (v, fromJust $ M.lookup v l)) $ vertices g
+    | otherwise = [(head $ vertices g, snd . head $ edges g)]
 
 main = putStrLn $ show g1