github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2025-01-03 21:16:12 +03:00
Code Issues Projects Releases Wiki Activity

Featurize the unmapped terms early.

Browse Source
This commit is contained in:
Rob Rix 2017-10-23 23:41:00 -04:00
parent 7c193c0b5e
commit fedf85e823
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/RWS.hs
View File

@ -63,7 +63,7 @@ rws _ _ as [] = This <$> as
rws _ _ [] bs = That <$> bs
rws canCompare _ [a] [b] = if canCompareTerms canCompare a b then [These a b] else [That b, This a]
rws canCompare equivalent as bs
= ses (\ a b -> equivalent (snd a) (snd b)) (zip [0..] as) (zip [0..] bs)
= ses (\ a b -> equivalent (term a) (term b)) (zipWith featurize [0..] as) (zipWith featurize [0..] bs)
& mapContiguous canCompare
& fmap (bimap snd snd)
@ -125,14 +125,14 @@ defaultMoveBound = 0
mapContiguous :: (Foldable syntax, Functor syntax, GAlign syntax)
=> ComparabilityRelation syntax (Record (FeatureVector ': fields1)) (Record (FeatureVector ': fields2))
-> [These (Int, Term syntax (Record (FeatureVector ': fields1))) (Int, Term syntax (Record (FeatureVector ': fields2)))]
-> [These (UnmappedTerm syntax (Record (FeatureVector ': fields1))) (UnmappedTerm syntax (Record (FeatureVector ': fields2)))]
-> [MappedDiff syntax (Record (FeatureVector ': fields1)) (Record (FeatureVector ': fields2))]
mapContiguous canCompare = go [] []
where go as bs [] = mapChunk as bs
go as bs (first : rest) = case first of
This (i, a) -> go (featurize i a : as) bs rest
That (j, b) -> go as (featurize j b : bs) rest
These _ _ -> mapChunk as bs <> (first : go [] [] rest)
This a -> go (a : as) bs rest
That b -> go as (b : bs) rest
These _ _ -> mapChunk as bs <> (bimap (termIndex &&& term) (termIndex &&& term) first : go [] [] rest)
mapChunk as [] = This . (termIndex &&& term) <$> reverse as
mapChunk [] bs = That . (termIndex &&& term) <$> reverse bs
mapChunk as bs = findNearestNeighbourTo canCompare (reverse as) (reverse bs)