added maca_trans_tagger_bt an (experimental) tagger with a (very) limited for...

added maca_trans_tagger_bt an (experimental) tagger with a (very) limited for of backtrack, modfied some help messages

maca_common/include/word_buffer.h

@@ -29,11 +29,6 @@
 #define word_buffer_is_last(wb)  (((wb)->current_index == (wb)->nbelem - 1)? 1 : 0)
 #define word_buffer_is_empty(wb) (((wb)->nbelem == 0)? 1 : 0)
 
-
-
-
-
-
 typedef struct {
   int size;           /* size of the array used to store words */
   int nbelem;         /* number of words in the buffer */

maca_trans_parser/src/context.c

@@ -164,6 +164,9 @@ void context_f2p_filename_help_message(context *ctx){
 void context_trace_mode_help_message(context *ctx){
   fprintf(stderr, "\t-T --traces            : activate trace mode (default is false)\n");
 }
+void context_debug_help_message(context *ctx){
+  fprintf(stderr, "\t-d --debug            : activate debug mode (default is false)\n");
+}
 
 context *context_read_options(int argc, char *argv[])
 {

maca_trans_parser/src/context.h

@@ -102,4 +102,7 @@ void context_ifpls_help_message(context *ctx);
 void context_input_help_message(context *ctx);
 void context_root_label_help_message(context *ctx);
 
+void context_debug_help_message(context *ctx);
+
+
 #endif

maca_trans_parser/src/maca_trans_parser.c

@@ -13,11 +13,12 @@
 /*#include"dnn_decoder.h"*/
 #include"config2feat_vec.h"
 
-void decode_help_message(context *ctx)
+void maca_trans_parser_help_message(context *ctx)
 {
   context_general_help_message(ctx);
   /* context_beam_help_message(ctx); */
   /* context_conll_help_message(ctx); */
+  context_debug_help_message(ctx);
   fprintf(stderr, "INPUT\n");
   context_input_help_message(ctx);
   context_mcd_help_message(ctx);
@@ -27,7 +28,7 @@ void decode_help_message(context *ctx)
   context_root_label_help_message(ctx);
 }
 
-void decode_check_options(context *ctx){
+void maca_trans_parser_check_options(context *ctx){
   if(ctx->help
      /*!ctx->conll_filename*/
      /*     || !ctx->perc_model_filename
@@ -35,7 +36,7 @@ void decode_check_options(context *ctx){
      || !ctx->vocabs_filename
      || !ctx->features_model_filename*/
      ){
-    decode_help_message(ctx);
+    maca_trans_parser_help_message(ctx);
     exit(1);
   }
 }
@@ -83,7 +84,7 @@ int main(int argc, char *argv[])
   context *ctx;
 
   ctx = context_read_options(argc, argv);
-  decode_check_options(ctx);
+  maca_trans_parser_check_options(ctx);
 
   set_linguistic_resources_filenames_parser(ctx);
   ctx->features_model = feat_model_read(ctx->features_model_filename, ctx->verbose);

maca_trans_parser/src/maca_trans_tagger_bt.c

+#include<stdio.h>
+#include<stdlib.h>
+#include<string.h>
+#include<unistd.h>
+#include<getopt.h>
+#include"context.h"
+#include"feat_fct.h"
+#include"feature_table.h"
+#include"dico.h"
+#include"beam.h"
+#include"form2pos.h"
+#include"simple_decoder_tagger.h"
+/*#include"dnn_decoder.h"*/
+#include"config2feat_vec.h"
+
+void decode_tagger_help_message(context *ctx)
+{
+  context_general_help_message(ctx);
+  context_beam_help_message(ctx);
+  context_conll_help_message(ctx);
+  fprintf(stderr, "INPUT\n");
+  context_input_help_message(ctx);
+  context_mcd_help_message(ctx);
+  context_model_help_message(ctx);
+  context_vocabs_help_message(ctx);
+  context_features_model_help_message(ctx);
+  context_f2p_filename_help_message(ctx);
+}
+
+void decode_tagger_check_options(context *ctx){
+  if(ctx->help
+     /*!ctx->conll_filename*/
+     /*     || !ctx->perc_model_filename
+     || !ctx->mcd_filename
+     || !ctx->vocabs_filename
+     || !ctx->features_model_filename*/
+     ){
+    decode_tagger_help_message(ctx);
+    exit(1);
+  }
+}
+
+void decode_tagger_set_linguistic_resources_filenames(context *ctx)
+{
+  char absolute_filename[500];
+  
+  if(!ctx->perc_model_filename){
+    strcpy(absolute_filename, ctx->maca_data_path);
+    strcat(absolute_filename, DEFAULT_MODEL_TAGGER_FILENAME);
+    ctx->perc_model_filename = strdup(absolute_filename);
+  }
+
+  if(!ctx->vocabs_filename){
+    strcpy(absolute_filename, ctx->maca_data_path);
+    strcat(absolute_filename, DEFAULT_VOCABS_TAGGER_FILENAME);
+    ctx->vocabs_filename = strdup(absolute_filename);
+  }
+
+  /*  if(!ctx->mcd_filename){
+    strcpy(absolute_filename, ctx->maca_data_path);
+    strcat(absolute_filename, DEFAULT_MULTI_COL_DESC_TAGGER_FILENAME);
+    ctx->mcd_filename = strdup(absolute_filename);
+    }*/
+
+  if(!ctx->features_model_filename){
+    strcpy(absolute_filename, ctx->maca_data_path);
+    strcat(absolute_filename, DEFAULT_FEATURES_MODEL_TAGGER_FILENAME);
+    ctx->features_model_filename = strdup(absolute_filename);
+  }
+
+  if(!ctx->f2p_filename){
+    strcpy(absolute_filename, ctx->maca_data_path);
+    strcat(absolute_filename, DEFAULT_F2P_FILENAME);
+    ctx->f2p_filename = strdup(absolute_filename);
+    ctx->f2p = form2pos_read(ctx->f2p_filename);
+  }
+
+  if(ctx->verbose){
+    fprintf(stderr, "perc_model_filename = %s\n", ctx->perc_model_filename);
+    fprintf(stderr, "vocabs_filename = %s\n", ctx->vocabs_filename);
+    fprintf(stderr, "mcd_filename = %s\n", ctx->mcd_filename);
+    fprintf(stderr, "perc_features_model_filename = %s\n", ctx->features_model_filename);
+    fprintf(stderr, "f2p_filename = %s\n", ctx->f2p_filename);
+  }
+}
+
+
+int main(int argc, char *argv[])
+{
+  context *ctx = context_read_options(argc, argv);
+  decode_tagger_check_options(ctx);
+
+  decode_tagger_set_linguistic_resources_filenames(ctx);
+  ctx->features_model = feat_model_read(ctx->features_model_filename, ctx->verbose);
+  ctx->vocabs = dico_vec_read(ctx->vocabs_filename, ctx->hash_ratio);
+  mcd_link_to_dico(ctx->mcd_struct, ctx->vocabs, ctx->verbose);
+
+  simple_decoder_tagger2(ctx);
+  
+  context_free(ctx);
+  return 0;
+}
+

perceptron/lib/include/feat_vec.h

@@ -13,10 +13,8 @@ typedef struct {
 /*#include "word_emb.h"*/
 #include "mcd.h"
 
-
 void      feat_vec_concat(feat_vec *fv1, feat_vec *fv2);
 feat_vec *feat_vec_copy(feat_vec *fv);
-
 feat_vec *feat_vec_new(int size);
 void      feat_vec_free(feat_vec *fv);
 int       feat_vec_add(feat_vec *fv, int feat);

perceptron/lib/src/feature_table.c

@@ -8,8 +8,6 @@
 feature_table *feature_table_load(char *filename, int verbose)
 {
   int i;
-
-
   feature_table *ft = NULL;
   int features_nb;
   int classes_nb;