hej stefan,
thanks for the code clean-up... not only icc likes this ;-) , but one
gets blind for these things when changing the algorithm several times.
-henning
Stefan Manegold wrote:
> Update of /cvsroot/monetdb/pathfinder/modules/pftijah
> In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv1312/modules/pftijah
>
> Modified Files:
> nexi.c pftijah.mx termdb.mx
> Log Message:
>
> for those who prefer clean code (like, e.g., Intel's icc):
> removed unused variables.
>
>
> Index: nexi.c
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
> retrieving revision 1.45
> retrieving revision 1.46
> diff -u -d -r1.45 -r1.46
> --- nexi.c 16 Jan 2007 07:53:07 -0000 1.45
> +++ nexi.c 18 Jan 2007 18:18:57 -0000 1.46
> @@ -161,14 +161,11 @@
> bool stem_stop_query;
> int topic_type;
> int preproc_type;
> - int processing_type;
> int query_num = 1;
> int query_end_num;
> int rewrite_type;
> - int language_type;
> int algebra_type;
> int return_all;
> - int base_type;
> char background_collection[20] = "";
>
> /* Result table name */
> @@ -236,10 +233,7 @@
> algebra_type = COARSE2;
> preproc_type = PLAIN;
> scale_on = FALSE;
> - processing_type = NO_STOP_STEM;
> rewrite_type = BASIC;
> - language_type = ENGLISH;
> - base_type = ONE;
> return_all = FALSE;
> stem_stop_query = FALSE;
> bool eq_init = FALSE;
> @@ -449,10 +443,8 @@
> } else if (strcmp(optName, "scoreBase") == 0) {
> if (strcasecmp(optVal, "ONE") == 0) {
> MILPRINTF(MILOUT, "scoreBase := 1;\n");
> - base_type = ONE;
> } else {
> MILPRINTF(MILOUT, "scoreBase := 0;\n");
> - base_type = ZERO;
> }
>
> } else if (strcmp(optName, "stem_stop_query") == 0) {
>
> Index: termdb.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/termdb.mx,v
> retrieving revision 1.6
> retrieving revision 1.7
> diff -u -d -r1.6 -r1.7
> --- termdb.mx 11 Jan 2007 11:25:50 -0000 1.6
> +++ termdb.mx 18 Jan 2007 18:18:57 -0000 1.7
> @@ -71,7 +71,7 @@
> size_t* hashbatSize;
> } termDbCtx;
>
> -extern int termdb_prelude();
> +extern int termdb_prelude(void);
>
> extern termDbCtx* tdb_open(char* name);
> extern int tdb_insertTerm(termDbCtx* tdb, char* term, oid o, int check);
> @@ -225,8 +225,7 @@
> return GDK_FAIL;
> }
>
> - BAT* tags;
> - if ( !
> (tags=pftu_create_bat(TERMDBTAGS,TYPE_str,TYPE_oid,1/*persistent*/)) )
> + if ( ! (pftu_create_bat(TERMDBTAGS,TYPE_str,TYPE_oid,1/*persistent*/)) )
> return GDK_FAIL;
>
> oid lastbat = 0;
>
> Index: pftijah.mx
> ===================================================================
> RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
> retrieving revision 1.89
> retrieving revision 1.90
> diff -u -d -r1.89 -r1.90
> --- pftijah.mx 18 Jan 2007 15:22:12 -0000 1.89
> +++ pftijah.mx 18 Jan 2007 18:18:57 -0000 1.90
> @@ -2761,7 +2761,7 @@
> BAT *newpre = NULL;
> int bs_tidpre, bs_oldindex, bs_oldpre, bs_newindex, bs_newpre, bs_res;
> int i,j, ressize = 0;
> - BUN lst_tidpre, lst_oldindex, lst_oldpre, lst_copy, lst_newindex,
> lst_newpre, lst_res, cur_tidpre, cur_oldindex, cur_oldpre;
> + BUN lst_tidpre, lst_oldindex, lst_copy, lst_newindex, lst_newpre,
> lst_res, cur_tidpre, cur_oldindex, cur_oldpre;
> oid tid;
>
> /* --------------------------- checks
> ---------------------------------- */
> @@ -2811,7 +2811,6 @@
>
> lst_tidpre = BUNlast(tidpre);
> lst_oldindex = BUNlast(oldindex) - bs_oldindex; /* last index is not a
> real term */
> - lst_oldpre = BUNlast(oldpre);
> lst_newindex = BUNlast(newindex);
> lst_newpre = BUNlast(newpre);
> lst_res = BUNlast(res);
> @@ -3159,7 +3158,6 @@
> si *stack;
> int stack_top = 0, i;
>
> - oid *A_cur_oid, *D_cur_oid;
> int SAs;
> int SDs;
> int SRs;
> @@ -3194,8 +3192,6 @@
> size = ((int*) BUNtloc(pre_size, BUNfirst(pre_size))) -
> (int)pre_size->hseqbase;
> D_cur_start = (oid *) BUNtail(Dstart, BUNfirst(Dstart));
> D_last_start = (oid *) BUNtail(Dstart, BUNlast(Dstart));
> - D_cur_oid = (oid *) BUNhead(Dstart,BUNfirst(Dstart));
> - A_cur_oid = (oid *) BUNhead(Astart, BUNfirst(Astart));
> A_cur_start = (oid *) BUNtail(Astart, BUNfirst(Astart));
> A_last_start = (oid *) BUNtail(Astart, BUNlast(Astart));
> dst = BUNlast(res);
>
>
> -------------------------------------------------------------------------
> Take Surveys. Earn Cash. Influence the Future of IT
> Join SourceForge.net's Techsay panel and you'll get the chance to share your
> opinions on IT & business topics through brief surveys - and earn cash
> http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
> _______________________________________________
> Monetdb-pf-checkins mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
