From 00f88e540f82a2bbd65db80dd7660f5d7b0578fe Mon Sep 17 00:00:00 2001
From: joshvera <josh@joshvera.com>
Date: Tue, 11 Apr 2017 17:10:08 -0400
Subject: [PATCH] Reverse the order of insertMapped arguments

---
 src/RWS.hs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/RWS.hs b/src/RWS.hs
index 5e9a117cd..766fbdb7e 100644
--- a/src/RWS.hs
+++ b/src/RWS.hs
@@ -45,7 +45,7 @@ rws' = do
   (featureAs, featureBs, mappedDiffs, allDiffs) <- genFeaturizedTermsAndDiffs' sesDiffs
   (diffs, remaining) <- findNearestNeighoursToDiff' allDiffs featureAs featureBs
   diffs' <- deleteRemaining' diffs remaining
-  rwsDiffs <- insertMapped' diffs' mappedDiffs
+  rwsDiffs <- insertMapped' mappedDiffs diffs'
   pure (fmap snd rwsDiffs)
 
 ses' :: (HasField fields (Maybe FeatureVector), RWS f fields :< e) => Eff e (RWSEditScript f fields)
@@ -106,13 +106,18 @@ run editDistance canCompare as bs = relay pure (\m k -> case m of
 
 type Diff f fields = These (Term f (Record fields)) (Term f (Record fields))
 
-insertMapped :: Foldable t => [(These Int Int, Diff f fields)] -> t (These Int Int, Diff f fields) -> [(These Int Int, Diff f fields)]
-insertMapped = foldl' (\into (i, mappedTerm) -> insertDiff (i, mappedTerm) into)
+insertMapped :: Foldable t => t (These Int Int, Diff f fields) -> [(These Int Int, Diff f fields)] -> [(These Int Int, Diff f fields)]
+insertMapped diffs into = foldl' (\into (i, mappedTerm) -> insertDiff (i, mappedTerm) into) into diffs
 
-deleteRemaining diffs unmappedAs = foldl' (\into (i, deletion) ->
-    insertDiff (This i, deletion) into)
-  diffs
-  ((termIndex &&& This . term) <$> unmappedAs)
+deleteRemaining :: (Traversable t)
+                => [(These Int Int, These (Term f (Record fields)) (Term f (Record fields)))]
+                -> t (RWS.UnmappedTerm f fields)
+                -> [(These Int Int, These (Term f (Record fields)) (Term f (Record fields)))]
+deleteRemaining diffs unmappedAs =
+  foldl'
+    (\into (i, deletion) -> insertDiff (This i, deletion) into)
+    diffs
+    ((termIndex &&& This . term) <$> unmappedAs)
 
 -- | Inserts an index and diff pair into a list of indices and diffs.
 insertDiff :: (These Int Int, These (Term f (Record fields)) (Term f (Record fields))) -> [(These Int Int, These (Term f (Record fields)) (Term f (Record fields)))] -> [(These Int Int, These (Term f (Record fields)) (Term f (Record fields)))]