Cleanup

src/Dodge/Path.hs

@@ -17,6 +17,7 @@ import Data.Maybe
 import Data.List
 import qualified Data.IntMap.Strict as IM
 import Data.Graph.Inductive hiding ((&))
+import qualified Data.Set as S
 --import Data.Graph.Inductive.PatriciaTree
 --import Data.Graph.Inductive.Graph hiding ((&))
 
@@ -78,11 +79,11 @@ pointTowardsImpulse a b w = find (flip (isWalkable a) w) =<< makePathBetweenPs a
 --        [] -> return Nothing
 --        _  -> return $ Just $ ns !! i
 --
-pairsToGraph :: (Ord a, Eq b) => (a -> a -> b) -> [(a,a)] -> Gr a b
+pairsToGraph :: (Ord a, Ord b) => (a -> a -> b) -> S.Set (a,a) -> Gr a b
 pairsToGraph f pairs = 
-    let nodes' = nub (map fst pairs ++ map snd pairs)
-        pairs' = map (\(x,y)->(x,y,f x y)) pairs
-    in undir $ run_ Data.Graph.Inductive.empty $ insMapNodesM nodes' >> insMapEdgesM pairs'
+    let nodes' = S.map fst pairs `S.union` S.map snd pairs
+        pairs' = S.map (\(x,y)->(x,y,f x y)) pairs
+    in undir $ run_ Data.Graph.Inductive.empty $ insMapNodesM (S.toList nodes') >> insMapEdgesM (S.toList pairs')
 
 removePathsCrossing :: Point2 -> Point2 -> World -> World
 removePathsCrossing a b w = w
@@ -90,6 +91,6 @@ removePathsCrossing a b w = w
     & pathGraphP .~ pg'
     & pathPoints .~ foldr insertPoint IM.empty (labNodes newGraph)
   where 
-    pg' = filter (isNothing . uncurry (intersectSegSeg a b)) $ _pathGraphP w
+    pg' = S.filter (isNothing . uncurry (intersectSegSeg a b)) $ _pathGraphP w
     insertPoint pp@(_,V2 x y) = insertInZoneWith (floorHun x) (floorHun y) (++) [pp]
     newGraph = pairsToGraph dist pg'