Merge pull request HIT-SCIR#260 from HIT-SCIR/develop

update examples/srl.cpp
Kitter · Nov 5, 2017 · a938aa2 · a938aa2
2 parents a6c1b0e + df962e9
commit a938aa2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/examples/srl.cpp b/examples/srl.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
 #include <vector>
 
-#include "ltp/SRL_DLL.h"
+#include "ltp/srl_dll.h"
 
 int main(int argc, char * argv[]) {
   if (argc < 2) {
     return -1;
   }
 
-  SRL_LoadResource(argv[1]);
+  srl_load_resource(argv[1]);
 
   std::vector<std::string> words;
   std::vector<std::string> postags;
@@ -20,7 +20,7 @@ int main(int argc, char * argv[]) {
   words.push_back("过问");    postags.push_back("v"); nes.push_back("O"); parse.push_back(make_pair(-1,"HED"));
   words.push_back("。");      postags.push_back("wp");nes.push_back("O"); parse.push_back(make_pair(2,"WP"));
 
-  DoSRL(words,postags,nes,parse,srl);
+  srl_dosrl(words,postags,parse,srl);
 
   for(int i = 0;i<srl.size();++i) {
     std::cout<<srl[i].first<<":"<<std::endl;
@@ -32,7 +32,7 @@ int main(int argc, char * argv[]) {
     }
   }
 
-  SRL_ReleaseResource();
+  srl_release_resource();
   return 0;
 }
 
diff --git a/tools/train/sample/srl/example-heldout.emb b/tools/train/sample/srl/example-heldout.emb
@@ -0,0 +1,6 @@
+中国 -0.158443 -0.408686 0.456070 -0.507545 -0.591701 -0.020052 0.210797 0.582804 1.403816 0.247402 0.629054 -0.484580 -0.306322 0.128314 -0.128151 -0.715512 -0.859184 -0.008483 0.019292 -0.129828 0.258050 0.083771 0.100666 -1.104843 0.206618 -0.316795 0.017391 -1.106159 0.526292 -1.561591 0.070252 -1.232670 -0.540847 0.209135 0.020901 -0.670785 0.173370 -0.317749 -0.399670 0.499518 0.375487 -0.945792 0.533455 -0.776382 0.323902 -0.081028 0.595363 -0.375705 0.008360 -0.245488 0.488171 0.141152 -0.754822 0.581701 -1.956556 0.530606 0.276863 -0.065434 0.213379 0.746306 0.028998 -0.024086 -0.417579 -0.404192 0.117560 0.131037 -0.591601 -0.418339 -0.155867 0.325476 0.322544 0.018893 0.010238 0.559502 -0.017793 -0.081230 0.841328 -2.040863 0.839675 -0.219696 -0.214493 -0.120557 0.207591 -0.111575 -0.490513 -0.177100 0.324662 0.293653 -0.126925 0.548142 -0.489558 -0.711276 0.079335 -0.551969 -0.209564 0.143889 -0.360970 -0.102272 0.233807 1.008743 0.938485 0.231551 -0.649394 0.497617 0.323686 -0.065424 -0.590031 0.681289 -0.301805 0.467801 -0.086431 -0.466555 -0.778127 0.119806 0.658572 0.661799 0.106364 -0.733322 -0.768823 0.404005 -0.438970 -0.038210 1.107275 -0.741110 0.501035 -0.351340 -0.622062 0.014967 0.002520 -0.563478 0.517555 0.783255 -0.260750 0.678217 -0.118178 0.704077 0.189346 -0.186904 -0.382336 -0.608566 -0.011799 0.015246 0.573109 -0.279494 -0.046384 0.542513 0.181983 -0.263112 0.074455 -0.439423 0.738457 -0.038564 -0.027273 -0.546145 1.288563 0.424679 -0.209599 -0.174464 -0.058254 0.576660 0.437043 0.952207 0.305388 -0.613263 0.632156 0.546800 0.151656 0.415012 0.591472 0.610709 0.219510 -0.059214 0.557834 -0.750846 -0.522891 -0.997930 -0.452465 0.316039 -0.427582 -0.226696 0.240008 0.208850 0.215881 -0.679863 -0.212403 -0.321180 -0.181528 0.218630 0.558361 0.584634 0.975253 -0.662866 -0.694251 0.027962 0.724282 -0.292049 -0.694960 -0.178007 -0.944607 -0.069616
+进出口 -0.053613 -0.512023 0.012264 0.955476 0.223896 0.300566 0.413563 1.197703 0.309968 0.291292 1.084964 -0.448442 0.198222 -0.004681 0.313389 -0.269551 -0.518328 0.472719 0.150318 0.081535 -0.342082 -0.491266 0.172832 -0.841607 0.763965 0.101512 -0.477280 -0.909515 0.233777 -0.694285 -0.390305 -0.679691 0.392803 0.320633 -0.292955 0.237032 0.171586 0.066188 -0.407805 -0.154007 0.253741 -0.455622 -0.325288 -0.720289 -1.012469 -0.089285 0.365884 -0.874325 0.501019 0.404243 -0.389161 -0.642303 0.549746 1.157374 -1.009219 0.109154 0.221033 -0.109690 0.204754 -0.252124 0.150883 0.202186 -0.593971 0.285468 -0.475787 0.552133 -0.294638 -0.717760 0.225167 -0.042888 0.440056 1.601558 0.671824 -0.095376 1.321159 0.199854 0.192057 -1.038500 1.009837 -0.271906 -0.346905 -0.239580 -0.037789 0.669137 -0.204306 0.343623 0.030026 -0.465641 -0.054023 -0.159428 -0.101556 0.395991 0.168854 0.332703 0.435697 -0.066827 0.560266 -0.533878 0.933784 -0.295538 -0.051786 0.075489 -0.246065 -0.241238 -0.322744 0.123956 0.181773 -0.170712 -0.538413 -0.034797 -0.239406 -0.459365 0.063104 0.734217 0.191227 0.889111 1.041035 1.184542 -0.065878 -0.055984 0.060355 0.665873 0.973214 0.381820 0.345138 -0.654388 0.241180 0.828834 0.132340 0.691497 0.712162 0.327987 -0.837354 -0.655799 -0.237083 0.768673 0.407321 -0.813443 0.226596 -0.116799 0.370516 -0.152420 0.767204 0.149785 0.260669 -0.186528 -0.671619 -0.297729 0.134292 -0.176665 0.053829 0.360760 0.167589 0.344000 -0.022959 -0.140297 0.264841 0.083346 -0.357785 0.174173 0.436179 -0.218999 0.632700 -0.442263 0.038677 -0.218486 0.112599 -0.044507 0.326714 -0.407170 -0.258469 -0.107662 0.262418 -0.255731 -1.108173 -0.039394 -0.438521 -0.501860 0.062077 -0.501460 0.588273 -0.449639 0.039641 -0.510115 0.757976 -0.293649 0.174438 -0.150054 0.580511 0.879110 -0.050307 0.018613 -0.491276 -1.075363 -0.103873 -0.706302 0.305337 -0.048484 0.287662 0.228170
+银行 0.227449 -0.164846 0.389792 0.709835 -0.030334 0.404648 0.818590 0.865757 -1.071143 0.150369 0.617371 -0.152668 -0.200125 -0.298619 -1.107339 -1.043299 -0.264205 0.266732 0.423672 -0.295489 0.510136 -0.191519 -0.163255 -0.093024 0.298752 -0.012723 -0.213147 -0.947657 0.265294 -0.397916 -0.323453 0.565812 -0.866625 -0.555878 0.166232 -0.335433 -0.368254 0.429109 -0.821616 0.215036 -0.353437 -0.600732 -0.586818 -0.889719 -0.557062 -0.199771 -0.161431 -0.397728 0.029442 0.038009 -0.439095 0.256899 0.025197 0.703959 -1.730150 -0.256002 -0.232319 0.471834 1.402062 0.474508 -0.958002 -0.448217 -0.033748 0.188825 -0.696565 0.530919 -1.186161 -0.499069 -0.078167 -0.187086 -0.307960 0.457354 0.100741 0.245490 -0.519108 0.417721 0.633786 -2.811427 0.061845 -1.208212 -0.075455 -0.029225 -0.533322 0.440083 -0.737712 0.378991 -0.214558 -0.605549 0.074248 0.582024 -0.401809 -0.064396 0.808275 0.431635 -1.090064 0.281680 -0.105944 0.111269 1.212115 -0.142159 1.052781 -0.037204 -0.602281 0.062409 -0.186932 0.523568 -0.325676 -0.002707 -0.045683 1.221088 0.274731 -0.286861 -0.248079 -0.955570 0.002529 0.330545 0.303435 0.315992 -0.183107 0.651534 0.182192 1.087986 0.557367 -0.812750 -0.218381 -0.500527 -0.116088 0.262952 -0.457996 0.516352 -0.098189 -0.582464 -1.429652 1.008355 0.263625 0.431115 -1.052548 -0.322799 -0.408084 -0.468311 0.654001 -0.777439 0.075728 0.724552 -0.199540 -0.430599 -0.208318 -0.356770 -0.288035 -1.011747 -0.179014 0.616557 -0.150594 0.309944 -0.510243 -0.885570 0.552190 0.628314 -0.269703 0.270214 -0.551481 0.040644 -0.187855 -0.040002 -0.175680 0.019893 0.657122 0.060449 0.267154 0.462712 0.192000 -0.508304 -0.640176 -0.283545 -0.273471 0.053195 -1.033201 -0.252235 0.056004 0.102381 -0.017170 -0.087988 0.167403 -0.273429 0.218968 0.262253 -0.404046 -0.004153 0.504207 0.102619 -0.040020 0.537570 -0.345557 0.566829 -0.277935 0.035658 -0.303098 0.449268 -0.776345 0.055105
+与 -0.665085 -0.298211 -0.444506 0.168549 -0.182713 -0.341804 0.999918 0.148970 0.098516 -0.572374 0.349640 0.137473 0.271439 0.392847 0.443456 -0.700282 -0.758509 0.249261 0.941635 0.685145 -0.631465 -0.109858 0.012378 -0.691653 -0.282196 -0.474354 0.104565 -1.371025 0.669870 -0.125435 -0.001131 -0.472093 -0.052096 0.028252 0.240984 0.028194 -1.067033 0.306176 -0.690038 -0.378203 -0.109895 0.109298 -0.833287 -0.337050 0.116090 -0.147843 0.581685 0.342314 -0.608671 0.632823 0.559035 -0.741633 0.190266 0.584498 -1.236847 0.222237 0.129921 0.234921 -0.227238 0.541338 -0.205147 -0.244748 -0.279496 0.562384 -0.063432 -0.090589 -0.390301 -0.428072 -0.381527 0.141063 0.116606 0.461571 0.072913 0.712098 -0.800051 0.054825 0.002095 -2.260233 0.075689 -0.043137 0.199350 0.518182 0.272347 0.353061 -0.639253 -0.735999 0.354696 0.450810 0.066236 -0.384951 0.158931 -0.787601 0.101224 -0.491693 0.893713 0.613691 0.236492 0.072882 -0.120029 0.137109 0.316825 0.132020 0.834075 0.012577 0.654081 -0.265291 0.352553 0.295070 0.344886 -0.308779 -0.353228 0.198068 -0.114092 0.058512 0.749942 -0.611970 -0.299349 -0.499498 -0.295304 0.616874 -0.051970 -0.196324 0.824908 -0.807734 -0.194293 -0.199082 -0.024011 -0.201670 -0.159661 -0.187339 0.532565 -0.397871 -0.397492 -0.309210 -0.170293 0.232540 -0.055144 0.054997 -0.136002 -0.098785 -0.247485 0.174486 0.452281 -0.108079 0.049412 -0.371062 -0.811632 -0.101707 0.099010 -0.215069 0.588471 0.437245 -0.476163 -0.804838 0.278534 -0.354666 -0.110457 -0.561567 -0.998890 0.060283 -0.052229 0.454472 0.185357 -0.224607 0.522702 -0.165780 0.292902 -0.189843 0.037059 -0.152310 -0.221772 -0.578044 0.592215 -0.500463 -0.231027 -0.682144 -0.513186 -0.313145 -0.355827 0.610536 0.132026 0.140567 -0.214395 -0.374653 -0.368724 -0.004493 0.046912 0.207937 0.348912 0.364518 0.388519 0.062021 -0.300004 0.374871 -0.184758 -0.118518 -0.607524 0.349952 0.060188 0.274930
+加强 -0.164033 -0.221449 -0.038053 -0.240517 0.488691 -0.106836 1.095880 0.647142 0.005253 -0.337006 0.397332 -0.600556 0.508869 -0.292366 0.735385 -0.109215 -0.024745 0.817287 0.497942 0.197790 -0.677416 0.654076 -0.446612 -0.127407 0.360499 0.084891 0.262587 -0.849513 -0.009665 0.304589 0.441694 -0.647765 -0.656750 0.014338 -0.111589 -0.116322 0.411734 -0.123476 -0.925646 -0.263320 0.385233 -0.042661 -0.203930 -0.817655 0.125196 -0.681551 0.475689 0.668461 -0.805544 0.476528 0.381643 -0.198715 0.155904 0.182714 -1.726679 -0.275389 -0.037394 -0.097521 0.327151 -0.338883 0.203310 -0.001734 0.108260 0.188012 -0.319211 -0.150341 -0.406715 -0.183507 -0.131122 -0.367228 -0.052858 0.219620 -0.404771 0.050513 -0.776888 -0.483556 0.640252 -2.617592 -0.032669 -0.029604 -0.160045 -0.056369 0.422076 0.461986 -0.835252 0.188968 0.091442 -0.152275 0.057134 -0.039012 -0.171230 -0.389303 0.203006 0.041971 0.249615 -0.662283 0.142454 -0.349750 -0.042963 -0.029862 -0.356460 0.070373 0.594029 0.180677 -0.066797 -1.077435 0.160302 0.175390 -0.648803 0.743424 -0.032826 -0.453194 0.435530 -0.110897 0.727836 -0.943007 -0.155731 -0.006026 -0.173237 0.087586 -0.147541 0.366435 0.394881 0.184109 0.170921 -0.087532 0.249893 0.434370 0.099495 0.207115 -0.193544 -0.476351 -0.884347 -0.071073 -0.784499 0.153569 0.278141 0.146668 0.268578 0.618891 -0.561811 0.144013 0.408477 -0.096836 0.158920 0.046325 -0.091175 -0.249033 0.351137 -0.019376 0.450462 0.398668 0.366021 -0.749461 0.714053 0.404991 0.601464 -1.113284 -0.591525 0.748492 -0.567192 0.638245 0.332533 -0.261482 0.094414 0.096645 0.381752 0.244463 -0.053520 -0.061361 0.394535 -0.575449 0.449450 0.024095 -0.625626 0.414792 0.362290 0.007321 0.048146 -0.167365 0.101878 0.260834 0.571563 0.254226 0.111672 0.059683 0.474872 0.125487 0.613130 0.941452 -0.123973 0.550829 0.008783 0.523829 -0.328919 -0.477738 -0.329820 0.660275 -0.057137 0.424902
+合作 -0.957469 0.006276 -0.447836 0.282246 -0.215471 -0.564610 0.786222 0.511246 -0.497815 -0.256468 0.723830 -0.702909 0.551036 -0.193069 0.480538 0.027291 -0.406322 1.093568 0.181341 1.048573 -0.118179 0.169661 0.308367 0.279114 0.285360 0.224721 0.099029 -2.419631 0.041026 0.213235 -0.053096 -0.492605 -0.188888 -0.727835 -0.035073 -0.073546 -0.023115 -0.492152 -0.014159 -0.995166 0.123812 -0.069432 0.072856 -0.393453 -0.019172 -0.567800 0.638653 0.718449 0.044397 0.446001 0.122105 -0.867382 -0.684358 0.977622 -1.605347 -0.295064 0.327664 0.238544 -0.002708 0.213846 -0.756345 0.488684 0.197379 0.202108 -0.149704 -0.361118 -0.502916 -0.034366 -0.177713 0.137281 0.360904 0.754611 -0.510877 0.280092 -0.437030 -0.173903 0.426377 -2.696192 -0.365479 -0.277502 -0.021264 0.377787 0.717590 0.920487 -0.847228 -0.058185 -0.056549 0.526604 0.284234 0.043062 0.294437 0.157376 0.026203 0.045558 0.288859 -0.020139 -0.030433 0.366766 -0.362600 -0.047010 -0.050166 -0.055833 0.213642 0.653794 0.434254 -0.682668 -0.225056 -0.227449 -0.079206 0.039106 -0.688248 -0.371099 0.569574 -0.070037 0.018300 -0.473041 0.085022 -0.940236 -0.409939 0.528264 -0.331953 0.142980 0.826276 0.223243 0.135537 -0.227327 -0.299509 0.267770 0.582908 0.155244 -0.120732 -0.421039 -1.254435 -0.536534 -0.142466 0.135383 -0.373380 0.614642 0.625069 1.266663 -0.064688 0.011234 0.407662 0.231676 0.257799 0.345586 -0.650124 0.360695 -0.277047 -0.916428 0.957138 0.285956 0.318915 0.367825 0.508042 0.002020 0.343033 -0.699403 -0.625564 -0.412715 -0.035483 0.032143 0.141664 -0.190054 0.367778 0.050516 0.536033 0.490721 -0.404878 0.075323 0.755995 -0.162740 0.907742 -0.257635 -0.496132 -0.305296 0.106594 -0.320758 -0.002185 0.174779 -0.576378 0.239783 1.028757 0.615700 0.335842 0.374795 0.151567 -0.382772 0.657218 0.566238 0.590974 0.242087 -0.490902 0.549366 -0.025532 -0.251473 -0.823705 0.517981 -0.402394 0.398875
diff --git a/tools/train/sample/srl/example-test.pisrl b/tools/train/sample/srl/example-test.pisrl
@@ -0,0 +1,8 @@
+中国  ns 2  ATT
+进出口    n  2  ATT
+银行 n  6  SBV
+与  p  2  ADV
+中国  ns 5    ATT
+银行   n 3  POB
+加强 v  -1 HED
+合作 v  6  VOB