Changeset 6ac84d8 for app/src

Timestamp:

05/09/08 12:42:32 (17 years ago)

Author:

obrebski <obrebski@…>

Branches:

master, help

Children:

19760ef

Parents:

3748bd1

git-author:

obrebski <obrebski@…> (05/09/08 12:42:32)

git-committer:

obrebski <obrebski@…> (05/09/08 12:42:32)

Message:

gue wreszcie dziala, tylko nie sortuje wynikow

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

Location:

app/src

Files:

• gue/common_guess.cc (modified) (1 diff)
• gue/main.cc (modified) (5 diffs)
• lib/word.cc (modified) (3 diffs)
• lib/word.h (modified) (3 diffs)

app/src/gue/common_guess.cc

@@ -26 +26 @@
       char buf[255];
       expand_path(args->dictionary_home_arg, buf);
-      sprintf(dictionary,"%s/%s/lem.bin",buf,args->language_arg);
+      sprintf(dictionary,"%s/%s/gue.bin",buf,args->language_arg);
       if(file_accessible(dictionary)!=0)
         {

app/src/gue/main.cc

@@ -13 +13 @@
 #define W_PREF 0.4
 
+
 int main(int argc, char** argv) {
 
@@ -25 +26 @@
   process_common_options(&args,argv[0]);
   process_guess_options(&args);
-
-
-  // PONIŻEJ POPRZEDNI KOD (JUSTYNY)
-// //preliminary command-line parsing - for configuration file info only
-//   gengetopt_args_info pre_args;
-
-//   if (cmdline_parser(argc, argv, &pre_args) != 0)
-//      exit(1);
-//   if(pre_args.config_given){
-//      printf("podano config: %s\n",pre_args.config_arg);
-//      non_standard_config=1;
-//   }
-  
-
-// //configuration file 1 parsing
-//      struct cmdline_parser_params *params;   
-//      params = cmdline_parser_params_init();
-//      params->initialize = 1;
-//      if(cmdline_parser_config_file(CONFIGFILE1,&args, params)!=0){
-//              printf("System-wide configuration file parsing error!\n");              
-//              exit(1);
-//      }  
-
-// //configuration file 2 parsing-overriding
-//      params->initialize=0;
-//      params->override=1;
-//      char* config2=(non_standard_config)?pre_args.config_arg:CONFIGFILE2;
-//      if(cmdline_parser_config_file(config2,&args, params)!=0){
-//              printf("User configuration file parsing error!\n");             
-//              return 1;
-//      }
-
-//      params->initialize=0;
-//      params->override=1;
-//      //params->check_required=1;
-        
-//      free(params);
-
-// //command-line options parsing-overriding
-//   if (cmdline_parser(argc, argv, &args) != 0)
-//     exit(1);
-
 
   char line[MAX_LINE];
@@ -84 +43 @@
       int start, len;
       
-      line[strlen(line)-1] = '\0';
+      //      line[strlen(line)-1] = '\0';
       
       if (!process_seg(line, args))
@@ -119 +78 @@
 
               count = 1;
+
+                      tab.sort();
               
               while (count < tab.count() && count <= guess_count)
@@ -177 +138 @@
               else
                 {
-                  for (int i=0; i< tab.count(); ++i)
+                  for (int i=0; i< count; ++i)
                     {
                       // kolejne opisy - kolejne linie.
                       char* descp=desc;
-                      descp += sprintf(desc, " %s%s,%s\n", output_field_prefix, tab[i].lemma(), tab[i].descr());
+                      descp += sprintf(desc, " %s%s,%s", output_field_prefix, tab[i].lemma(), tab[i].descr());
                       if(weights) descp += sprintf(descp,":%d",(int)tab[i].w_suf());
+                      descp += sprintf(descp,"\n");
                       strcpy(outline,line);
                       outline[strlen(outline)-1]='\0';

app/src/lib/word.cc

@@ -16 +16 @@
   lemd[i]='\0';
   if(isdigit(lemd[0]))
-    fullform(f,lemd,l);  // je¶li lemat zakodowany
+    fullform(f,lemd,l);  // je¶li lemat zakodowany
   else
-    strcpy(l,lemd);     // je¶li lemat w pe³nej postaci
+    strcpy(l,lemd);     // je¶li lemat w pe³nej postaci
   strcpy(d,de+i+1);
 }
@@ -25 +25 @@
 bool Word::cmp_w(Word a, Word b) {
   return (a.w_suf() > b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool Word::cmp_w_rev(Word a, Word b) {
+  return (a.w_suf() < b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool cmp_w_fun(Word a, Word b) {
+  return (a.w_suf() > b.w_suf());
+}
+//---------------------------------------------------------------------------
+bool cmp_w_rev_fun(Word a, Word b) {
+  return (a.w_suf() < b.w_suf());
 }
 //---------------------------------------------------------------------------
@@ -110 +122 @@
 void Words::sort() {
   std::sort(tab.begin(), tab.end(), Word::cmp_w);
+}
+
+//---------------------------------------------------------------------------
+void Words::sort_rev() {
+  std::sort(tab.begin(), tab.end(), cmp_w_rev_fun);
 }
 

app/src/lib/word.h

@@ -40 +40 @@
 public:
   static bool cmp_w(Word a, Word b);
+  static bool cmp_w_rev(Word a, Word b);
 
   Word() : _len_suf(-1) { *f='\0'; returned=0; };
@@ -104 +105 @@
 
 //---------------------------------------------------------------------------
+
+
+
+
+bool cmp_w_fun(Word a, Word b);
+bool cmp_w_rev_fun(Word a, Word b);
+
+
 //---------------------------------------------------------------------------
 //---------------------------------------------------------------------------
@@ -133 +142 @@
 
   void sort();
+  void sort_rev();
 
   void prn(ostream& os);