diff --git a/maca_common/src/feat_model.c b/maca_common/src/feat_model.c index 503da467a15a184d03978b13bbbe2f511a6bc3d1..4bf28ca9c1777129708bd26cb5f66cb3a7b3d288 100644 --- a/maca_common/src/feat_model.c +++ b/maca_common/src/feat_model.c @@ -130,36 +130,6 @@ void catenate_int(char *string, int val) strcat(string, s); } -int feat_model_get_feat_value_fann(feat_model *fm, config *c, int feat_nb) -{ - feat_desc *fd = fm->array[feat_nb]; - /* fm must be exclusively composed of simple features */ - return fd->array[0]->fct(c); -} - -int feat_model_get_feat_value_cff(feat_model *fm, config *c, dico *dico_features, int feat_nb, int mode) -{ - feat_desc *fd = fm->array[feat_nb]; - int i; - int feat_val; - - /* the name of the feature is built in fm->string and its value in the dictionnary (dico_features) is returned */ - fm->string[0] = '\0'; - for(i=0; i < fd->nbelem; i++){ - strcat(fm->string, fd->array[i]->name); - strcat(fm->string, "=="); - feat_val = fd->array[i]->fct(c); - catenate_int(fm->string, feat_val); - } - - if(mode == LOOKUP_MODE){ - if(fm->string) - /* printf("fmstring = %s\n", fm->string); */ - return dico_string2int(dico_features, fm->string); - } - return dico_add(dico_features, fm->string); -} - feat_model *feat_model_new(char *name) { diff --git a/maca_trans_parser/src/config2feat_vec.c b/maca_trans_parser/src/config2feat_vec.c index 0b63b1633ca98ed0d4b7c6d6eea27e37a3e7001d..362125b7c06a3751e5fcf665b3d0423f7228c877 100644 --- a/maca_trans_parser/src/config2feat_vec.c +++ b/maca_trans_parser/src/config2feat_vec.c @@ -5,7 +5,6 @@ #include"feat_model.h" #include"config2feat_vec.h" - int get_feat_value_fann(feat_model *fm, config *c, int feat_nb) { feat_desc *fd = fm->array[feat_nb]; @@ -23,6 +22,7 @@ int get_feat_value_cff(feat_model *fm, config *c, dico *dico_features, int feat_ fm->string[0] = '\0'; for(i=0; i < fd->nbelem; i++){ strcat(fm->string, fd->array[i]->name); + strcat(fm->string, "=="); feat_val = fd->array[i]->fct(c); catenate_int(fm->string, feat_val); }