Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv25979/modules/pftijah/tjc
Modified Files:
tjc_optimize.c
Log Message:
propagated changes of Friday Apr 03 2009
from the Feb2009 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/04/03 - hrode: modules/pftijah/tjc/tjc_optimize.c,1.3.2.2
one optimization actually changes the query semantics, which is OK for most
retrieval models, but not for the LM model
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: tjc_optimize.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_optimize.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tjc_optimize.c 6 Feb 2009 13:02:40 -0000 1.4
+++ tjc_optimize.c 3 Apr 2009 12:32:25 -0000 1.5
@@ -407,14 +407,16 @@
-void optimize(TJptree_t *ptree, TJpnode_t *root)
+void optimize(tjc_config *tjc_c, TJptree_t *ptree, TJpnode_t *root)
{
//root is not used in the current optimization rules
(void) root;
rule4 (ptree);
rule5 (ptree);
rule6 (ptree);
- rule7 (ptree);
+ //rule 7 would change the semnatics for conjunctive retrieval models
+ if (strcmp(tjc_c->irmodel, "LM") != 0)
+ rule7 (ptree);
rule8 (ptree);
}
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
