diff --git a/maca_trans_parser/src/maca_trans_parser_conll2fann.c b/maca_trans_parser/src/maca_trans_parser_conll2fann.c index d116b9a6e333476d9aa744190ef47231a34f7cd8..a1745d2053e39ccca87c4d9d0795bc0a6eb73baa 100644 --- a/maca_trans_parser/src/maca_trans_parser_conll2fann.c +++ b/maca_trans_parser/src/maca_trans_parser_conll2fann.c @@ -13,6 +13,9 @@ #include"word_emb.h" #include"config2feat_vec.h" + +void feat_vec_print_dnn(FILE *f, feat_vec *fv, feat_model *fm, mcd *m); + void transform_treebank_help_message(context *ctx) { context_general_help_message(ctx); diff --git a/maca_trans_parser/src/train_perceptron.c b/maca_trans_parser/src/train_perceptron.c index 54ff2990ec7318da4a84bc90dc1720b16ce77b16..33da5ebaa2d7fe5cf98dc24bac6a0bb002f8d3f2 100644 --- a/maca_trans_parser/src/train_perceptron.c +++ b/maca_trans_parser/src/train_perceptron.c @@ -95,8 +95,8 @@ feature_table *train_perceptron(context *ctx) char mvt_oracle_type; int mvt_oracle_label; int i,j; - config *config_pred; - int mvt_pred_code; + /* config *config_pred; */ + /* int mvt_pred_code; */ feat_vec *fv = feat_vec_new(feature_types_nb); sentence *ref = NULL; int sentence_nb = 0; @@ -113,7 +113,7 @@ feature_table *train_perceptron(context *ctx) conll_file_ref = myfopen(ctx->conll_filename, "r"); config_oracle = config_initial(conll_file, ctx->mcd_struct, 1000, 0); - config_pred = config_initial(conll_file, ctx->mcd_struct, 1000, 0); + /* config_pred = config_initial(conll_file, ctx->mcd_struct, 1000, 0); */ sentence_nb = 0; while((ref = sentence_read(conll_file_ref, ctx->mcd_struct)) && (sentence_nb < ctx->sent_nb)){ queue_read_sentence(config_oracle->bf, conll_file, ctx->mcd_struct); @@ -126,7 +126,8 @@ feature_table *train_perceptron(context *ctx) mvt_oracle_type = movement_type(mvt_oracle_code); mvt_oracle_label = movement_label(mvt_oracle_code); - mvt_pred_code = perceptron_update(mvt_oracle_code, fv, ft, ft_sum, counter++); + /* mvt_pred_code = perceptron_update(mvt_oracle_code, fv, ft, ft_sum, counter++); */ + perceptron_update(mvt_oracle_code, fv, ft, ft_sum, counter++); if(mvt_oracle_type == MVT_LEFT){ /* printf("LEFT\n"); */ @@ -229,8 +230,8 @@ feature_table *train_perceptron_early_update(context *ctx) int mvt_oracle_label; int i,j; config *config_pred; - int mvt_pred_code; - feat_vec *fv = feat_vec_new(feature_types_nb); + /* int mvt_pred_code; */ + /* feat_vec *fv = feat_vec_new(feature_types_nb); */ sentence *ref = NULL; int sentence_nb = 0; FILE *conll_file = NULL; @@ -240,14 +241,14 @@ feature_table *train_perceptron_early_update(context *ctx) feature_table *ft = feature_table_new(1000000, ctx->mvt_nb); int counter = 0; int epoch; - int count_ok = 0; - int count_ko = 0; + /* int count_ok = 0; */ + /* int count_ko = 0; */ beam *current_beam= beam_new(ctx->beam_width); beam *next_beam= beam_new(ctx->beam_width); beam *final_beam= beam_new(ctx->beam_width); beam *tmp_beam= NULL; int oracle_rank; - config *argmax; + /* config *argmax; */ for(epoch = 0; epoch < ctx->iteration_nb; epoch++){ fprintf(stderr, "[%d]", epoch + 1); @@ -354,8 +355,8 @@ feature_table *train_perceptron_early_update(context *ctx) int perceptron_update(int class_ref, feat_vec *fv, feature_table *ft, feature_table *ft_sum, int counter) { - int classes_nb = ft->classes_nb; - int cla; + /* int classes_nb = ft->classes_nb; */ + /* int cla; */ int argmax; int feat; float max;