Changeset b3179eb

Timestamp:

04/11/08 12:48:20 (17 years ago)

Author:

pawelk <pawelk@…>

Branches:

master, help

Children:

aa9f1bc

Parents:

635ee52

git-author:

pawelk <pawelk@…> (04/11/08 12:48:20)

git-committer:

pawelk <pawelk@…> (04/11/08 12:48:20)

Message:

Dolozylismy dwie opcje do kora: wyswietlanie lub nie wynikow oraz wyswietlanie liczby najlepszych zmian.

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@27 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app/src/kor

Files:

• cmdline_cor.ggo (modified) (1 diff)
• common_cor.cc (modified) (2 diffs)
• common_cor.h (modified) (1 diff)
• main.cc (modified) (4 diffs)

app/src/kor/cmdline_cor.ggo

@@ -4 +4 @@
 option "dictionary-home"        -       "Dictionary home dir." string typestr="FILENAME" no hidden
 option "dictionary"             d       "Dictionary" string typestr="FILENAME" default="cor.bin" no
-option "distance"               n       "Maximal edit distance." int default="1" no
+option "distance"               D       "Maximal edit distance." int default="1" no
 option "replace"                r       "Replace original form with corrected form, place original form in the cor field. This option has no effect in single mode" flag off
 #option "single"                        -       "Place all alternatives in the same line" flag off
 option "weights"                w       "File with translation rules." string typestr="FILENAME" default="weight.cor" no
 option "threshold"              t       "Edit distance threshold" float default="1" no
+option "show-scores"            -       "Show scores" flag off
+option  "count"                 n       "Print only count best results" int no
+

app/src/kor/common_cor.cc

@@ -8 +8 @@
 char file_weights[MAX_PATH_LENGTH];
 float threshold;
+bool show_scores = false;
+int result_count;
 
 void process_cor_options(gengetopt_args_info* args)
@@ -25 +27 @@
   
   threshold = args->threshold_arg;
+
+  show_scores = args->show_scores_flag;
+
+  if(args->count_given) {
+    result_count = args->count_arg;
+  }
+  else {
+    result_count = 0;
+  }
 }

app/src/kor/common_cor.h

@@ -22 +22 @@
 extern char file_weights[];
 extern float threshold;
+extern bool show_scores;
+extern int result_count;
 
 #endif

app/src/kor/main.cc

@@ -77 +77 @@
                       tab.sort();
 
+                int max_cnt = 0;
+                if(result_count < 1) {
+                        max_cnt = tab.count();
+                }
+                else {
+                        max_cnt = (tab.count() < result_count) ? tab.count() : result_count;
+                }
+                
               if(args.replace_flag)
                 {
@@ -98 +106 @@
                     {
                       char* p=corfield;
-                      for(int i=tab.count()-1; i >= 0; --i)
+                      for(int i=tab.count()-1; i >= tab.count()-max_cnt; --i)
                         {
                           if(tab[i].w_suf() > threshold) continue;
                           restorecasing(tab[i].form(),tab[i].form(),formcasing);
-                          p += sprintf(p," %s%s,%1.2f",output_field_prefix,tab[i].form(),tab[i].w_suf());
+                          p += sprintf(p," %s%s",output_field_prefix,tab[i].form());
+                          if(show_scores) {
+                            p += sprintf(p,",%1.2f",tab[i].w_suf());
+                          }
                         }
                       sprintf(p,"\n");
@@ -115 +126 @@
                       char* p=corfield;
                       p += sprintf(p," %s",output_field_prefix);
-                      for(int i=tab.count()-1; i >= 0; --i)
+                      for(int i=tab.count()-1; i >= tab.count()-max_cnt; --i)
                         {
                           if(tab[i].w_suf() > threshold) continue;
                           restorecasing(tab[i].form(),tab[i].form(),formcasing);
-                          p += sprintf(p,(i==0)?"%s,%1.2f":";%s,%1.2f",tab[i].form(),tab[i].w_suf());
+                          p += sprintf(p,(i==0)?"%s":";%s",tab[i].form());
+                          if(show_scores) {
+                            p += sprintf(p,",%1.2f",tab[i].w_suf());
+                          }
                         }
                       
@@ -131 +145 @@
                   else
                     {
-                      for(int i=tab.count()-1; i >= 0; --i)
+                      for(int i=tab.count()-1; i >= tab.count()-max_cnt; --i)
                         {
                           if(tab[i].w_suf() > threshold) continue;
                           restorecasing(tab[i].form(),tab[i].form(),formcasing);
-                          sprintf(corfield," %s%s,%1.2f\n",output_field_prefix,tab[i].form(),tab[i].w_suf());
+                          char* p = corfield;
+                          p += sprintf(p," %s%s",output_field_prefix,tab[i].form());
+                          if(show_scores) {
+                                p += sprintf(p,",%1.2f",tab[i].w_suf());
+                          }
+                          p += sprintf(p, "\n");
                           strcpy(outline,line);
                           outline[strlen(outline)-1]='\0';