diff --git a/config b/config index 45bf3e1..ebc19e5 100644 --- a/config +++ b/config @@ -27,13 +27,13 @@ LCG_NO_NODES=10000000 NO_PROCESSES=4 # Is Concraft enabled -CONCRAFT_ENABLED=true +CONCRAFT_ENABLED=false # Path to Concraft CONCRAFT_PATH=../concraft/ # Is MateParser enabled -MATE_PARSER_ENABLED=true +MATE_PARSER_ENABLED=false # Path to MateParser MATE_PARSER_PATH=../dependencyParser/basic/mate-tools/ @@ -45,4 +45,4 @@ SWIGRA_ENABLED=false SWIGRA_PATH=../swigra/parser/ # Is sentence selection enabled -SENTENCE_SELECTION_ENABLED=true +SENTENCE_SELECTION_ENABLED=false diff --git a/parser/makefile b/parser/makefile index 109e150..661052a 100755 --- a/parser/makefile +++ b/parser/makefile @@ -16,9 +16,9 @@ SEM= semGraph.ml semTypes.ml semStringOf.ml semLatexOf.ml semMmlOf.ml semMrl.ml EXEC= execTypes.ml visualization.ml ../diagnostics/treeChange.ml exec.ml ../diagnostics/LCGfields.ml #../diagnostics/compTrees.ml all: -# $(OCAMLOPT) -o pipe $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) pipe.ml - $(OCAMLOPT) -o server2 $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) server.ml - $(OCAMLOPT) -o parser2.cgi $(OCAMLOPTFLAGS) $(PRE) LCGtypes.ml LCGstringOf.ml LCGrules.ml LCGrenderer.ml LCGchart.ml LCGlatexOf.ml semTypes.ml semMmlOf.ml execTypes.ml visualization.ml webInterface.ml + $(OCAMLOPT) -o pipe $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) pipe.ml +# $(OCAMLOPT) -o server2 $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) server.ml +# $(OCAMLOPT) -o parser2.cgi $(OCAMLOPTFLAGS) $(PRE) LCGtypes.ml LCGstringOf.ml LCGrules.ml LCGrenderer.ml LCGchart.ml LCGlatexOf.ml semTypes.ml semMmlOf.ml execTypes.ml visualization.ml webInterface.ml # $(OCAMLOPT) -o eniam.distr $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) overseer.ml # $(OCAMLOPT) -o eniam.worker $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) worker.ml # $(OCAMLOPT) -o parser.api $(OCAMLOPTFLAGS) $(PRE) $(LCG) $(DISAMB) $(SEM) $(EXEC) apiInterface.ml diff --git a/parser/pipe.ml b/parser/pipe.ml index f386b5f..3c4001b 100644 --- a/parser/pipe.ml +++ b/parser/pipe.ml @@ -129,7 +129,7 @@ let process_id s = let process_conll_corpus filename = let corpus = File.file_in filename (fun file -> CONLL.match_corpus (CONLL.load_corpus file)) in print_endline "process_conll_corpus"; - let corpus = [List.hd corpus] in + (* let corpus = [List.hd corpus] in *) let ic,oc = Unix.open_connection (get_sock_addr Paths.pre_host Paths.pre_port) in Xlist.iter corpus (fun query -> let id = process_id (get_query_id query) in @@ -157,7 +157,8 @@ let process_conll_corpus filename = let _ = (* process_conll_corpus "../../NLP resources/Skladnica-zaleznosciowa-mod_130121.conll"; *) (* process_conll_corpus "../../NLP resources/skladnica_zaleznosciowa.conll"; *) - process_conll_corpus "../testy/skladnica-test1.conll"; + (* process_conll_corpus "../testy/skladnica-test1.conll"; *) + process_conll_corpus "../testy/skladnica-test2.conll"; () (* TO DO: diff --git a/testy/skladnica-test2.conll b/testy/skladnica-test2.conll new file mode 100644 index 0000000..faf79b7 --- /dev/null +++ b/testy/skladnica-test2.conll @@ -0,0 +1,59 @@ +1 Ponownie ponownie adv adv pos 2 adjunct _ _ +2 musiał musieć praet praet sg|m1|imperf 0 pred _ _ +3 użyć użyć inf inf perf 2 comp_inf _ _ +4 ręcznika ręcznik subst subst sg|gen|m3 3 obj _ _ +5 . . interp interp _ 2 punct _ _ + +1 - - interp interp _ 4 punct _ _ +2 Obcokrajowiec obcokrajowiec subst subst sg|nom|m1 4 subj _ _ +3 też też qub qub _ 4 adjunct _ _ +4 ma mieć fin fin sg|ter|imperf 0 pred _ _ +5 szanse szansa subst subst pl|acc|f 4 obj_th _ _ +6 ? ? interp interp _ 4 punct _ _ + +# trees/NKJP_1M_1202900095/morph_3-p/morph_3.46-s.xml.tree +1 - - interp interp 0 _ _ _ +2 Słoń słoń subst subst sg|nom|m2 4 _ _ _ +3 - - interp interp 0 _ _ _ +4 powiedział powiedzieć praet praet sg|m1|perf 0 _ _ _ +5 Pinio Pinio subst subst sg|nom|m1 4 _ _ _ +6 . . interp interp 0 _ _ _ + +# trees/NKJP_1M_2002000114/morph_2-p/morph_2.72-s.xml.tree +1 - - interp interp 0 _ _ _ +2 Nie nie qub qub 3 _ _ _ +3 mogę móc fin fin sg|pri|imperf 7 _ _ _ +4 ci ty ppron12 ppron12 sg|dat|m1|sec|nakc 5 _ _ _ +5 powiedzieć powiedzieć inf inf perf 3 _ _ _ +6 - - interp interp 0 _ _ _ +7 zachrypiał zachrypieć praet praet sg|m1|perf 0 _ _ _ +8 . . interp interp 0 _ _ _ + +# trees/NKJP_1M_2002000028/morph_5-p/morph_5.40-s.xml.tree +1 - - interp interp 0 _ _ _ +2 Właśnie właśnie qub qub 4 _ _ _ +3 to to subst subst sg|acc|n 4 _ _ _ +4 robię robić fin fin sg|pri|imperf 6 _ _ _ +5 - - interp interp 0 _ _ _ +6 odpowiedział odpowiedzieć praet praet sg|m1|perf 0 _ _ _ +7 twardo twardo adv adv pos 6 _ _ _ +8 . . interp interp 0 _ _ _ + +# trees/NKJP_1M_1202000001/morph_3-p/morph_3.9-s.xml.tree +1 CKM CKM subst subst sg|nom|n 0 _ _ _ +2 : interp 0 _ _ _ +3 Jak jak adv adv pos 5 _ _ _ +4 mężczyzna mężczyzna subst subst sg|nom|m1 5 _ _ _ +5 powinien powinien winien winien sg|m1|imperf 1 _ _ _ +6 na na prep prep acc 8 _ _ _ +7 ciebie ty ppron12 ppron12 sg|acc|f|sec|akc 6 _ _ _ +8 patrzeć patrzeć inf inf imperf 5 _ _ _ +9 ? ? interp interp 0 _ _ _ + +# trees/NKJP_1M_2001000023/morph_1-p/morph_1.61-s.xml.tree +1 Pochylił pochylić praet praet sg|m1|perf 0 _ _ _ +2 em być aglt aglt sg|pri|imperf|wok 1 _ _ _ +3 się się qub qub 1 _ _ _ +4 nad nad prep prep inst|nwok 1 _ _ _ +5 nim on ppron3 ppron3 sg|inst|m1|ter|akc|praep 4 _ _ _ +6 : interp 0 _ _ _