Commit 004408aebf4d1bfcfbd0105f87afe9a1de94498b

Authored by Daniel Oklesiński
1 parent c0772f92

zmiany w makefile'u i CONLL.ml

corpora/CONLL.ml
... ... @@ -45,18 +45,18 @@ let rec string_of_text mode = function
45 45  
46 46 let rec establish_for_token i res text = function
47 47 h :: t -> if Xstring.check_prefix " " text
48   - then establish_for_token (i+1) res (Xstring.cut_prefix " " text) (h :: t)
  48 + then establish_for_token (i+100) res (Xstring.cut_prefix " " text) (h :: t)
49 49 else if Xstring.check_prefix h.orth text
50 50 then
51   - let n = List.length @@ Xunicode.utf8_chars_of_utf8_string h.orth in
  51 + let n = (List.length @@ Xunicode.utf8_chars_of_utf8_string h.orth)*100 in
52 52 let n_h = {h with beg = i ; len = n} in
53 53 establish_for_token (i+n) (n_h :: res) (Xstring.cut_prefix h.orth text) t
54 54 else failwith ("establish_for_token :" ^ h.orth ^ " " ^ text)
55   - | [] -> 0, i, res
  55 + | [] -> 100, i, res
56 56  
57 57 let rec establish_lengths text = function
58 58 RawSentence text -> failwith ("establish_lengths: " ^ text)
59   - | StructSentence (tokens, n) -> let pbeg, plen, rev_tokens = establish_for_token 0 [] text tokens in
  59 + | StructSentence (tokens, n) -> let pbeg, plen, rev_tokens = establish_for_token 100 [] text tokens in
60 60 pbeg, plen, StructSentence (List.rev rev_tokens, n)
61 61 | ORSentence (_,_,_,_) -> failwith ("establish_lengths: ORSentence")
62 62 | AltSentence alts -> if List.exists (fun (mode, s) -> mode = CONLL) alts
... ...
corpora/makefile
1 1 OCAMLC=ocamlc
2 2 OCAMLOPT=ocamlopt
3 3 OCAMLDEP=ocamldep
4   -INCLUDES=-I +xml-light -I +xlib -I +zip -I +bz2 -I ../pre
  4 +INCLUDES=-I +xml-light -I +xlib -I +zip -I +bz2 -I ../pre -I ../parser
5 5 OCAMLFLAGS=$(INCLUDES) -g
6 6 OCAMLOPTFLAGS=$(INCLUDES) unix.cmxa xml-light.cmxa str.cmxa nums.cmxa zip.cmxa bz2.cmxa xlib.cmxa
7 7  
... ...
parser/makefile
1 1 OCAMLC=ocamlc
2 2 OCAMLOPT=ocamlopt
3 3 OCAMLDEP=ocamldep
4   -INCLUDES=-I +xml-light -I +xlib -I +zip -I +bz2 -I ../../../Dropbox/lib/latexvis -I ../lib/xt -I ../../../Dropbox/Clarin-pl/podzadania/nkjp/fold_text -I ../podzadania/morfeusz -I ../pre -I ../corpora
  4 +INCLUDES=-I +xml-light -I +xlib -I +zip -I +bz2 -I ../../../Dropbox/lib/latexvis -I ../../installed/latexvis -I ../lib/xt -I ../../../Dropbox/Clarin-pl/podzadania/nkjp/fold_text -I ../podzadania/morfeusz -I ../pre -I ../corpora
5 5 #INCLUDES=-I +xml-light -I +xlib -I ../pre
6 6 OCAMLFLAGS=$(INCLUDES) -g
7 7 OCAMLOPTFLAGS=$(INCLUDES) unix.cmxa xml-light.cmxa str.cmxa nums.cmxa zip.cmxa bz2.cmxa xlib.cmxa latexvis.cmxa #nkjp.cmxa
... ...