diff options
| author | Aarne Ranta <aarne@chalmers.se> | 2018-12-18 19:06:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-18 19:06:25 +0200 |
| commit | b3a2b53df2ec75add72447d7aa2032736c4f725c (patch) | |
| tree | bed7607a38772632aa62ba1c33cdb831063c2d0a /src | |
| parent | 40e7544a2beda2e0579e39114ba7ff4f722acbc1 (diff) | |
| parent | 77c0a8e1008181afeed80b89f84ce84f4a125830 (diff) | |
Merge pull request #22 from pkolachi/master
fix conll output in gf2ud and allow comments in dependency configs
Diffstat (limited to 'src')
| -rw-r--r-- | src/runtime/haskell/PGF/VisualizeTree.hs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/runtime/haskell/PGF/VisualizeTree.hs b/src/runtime/haskell/PGF/VisualizeTree.hs index c15d2b1e7..53cf96a04 100644 --- a/src/runtime/haskell/PGF/VisualizeTree.hs +++ b/src/runtime/haskell/PGF/VisualizeTree.hs @@ -236,10 +236,18 @@ graphvizDependencyTree format debug mlab mclab pgf lang t = root_lbl = "ROOT" unspec = text "_" +-- auxiliaries for UD conversion PK 15/12/2018 +rmcomments :: String -> String +rmcomments [] = [] +rmcomments ('-':'-':xs) = [] +rmcomments ('-':x :xs) = '-':rmcomments (x:xs) +rmcomments (x:xs) = x:rmcomments xs + -- | Prepare lines obtained from a configuration file for labels for -- use with 'graphvizDependencyTree'. Format per line /fun/ /label/@*@. getDepLabels :: String -> Labels -getDepLabels s = Map.fromList [(mkCId f,ls) | f:ls <- map words (lines s)] +-- getDepLabels s = Map.fromList [(mkCId f,ls) | f:ls <- map words (lines s)] +getDepLabels s = Map.fromList [(mkCId f,ls) | f:ls <- map (words . rmcomments) (lines s)] -- the old function, without dependencies graphvizParseTree :: PGF -> Language -> GraphvizOptions -> Tree -> String @@ -800,12 +808,14 @@ getCncDepLabels s = wlabels s ++ flabels s sortBy (comparing fst) . concatMap analyse . filter chooseW . +-- map rmcomments . lines flabels = map Right . map collectTags . map words . filter chooseF . +-- map rmcomments . lines --- choose is for compatibility with the general notation @@ -836,6 +846,7 @@ getCncDepLabels s = wlabels s ++ flabels s collectTags (w:ws) = (tail w,ws) +-- added init to remove the last \n. otherwise, two empty lines are in between each sentence PK 17/12/2018 printCoNLL :: CoNLL -> String -printCoNLL = unlines . map (concat . intersperse "\t") +printCoNLL = init . unlines . map (concat . intersperse "\t") |