Update of /cvsroot/monetdb/pathfinder/modules/pftijah/tjc
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv23335/tjc
Modified Files:
Tag: Feb2009
tjc_main.c tjc_optimize.c tjc_optimize.h
Log Message:
one optimization actually changes the query semantics, which is OK for most
retrieval models, but not for the LM model
U tjc_optimize.h
Index: tjc_optimize.h
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_optimize.h,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- tjc_optimize.h 28 Jan 2009 22:31:01 -0000 1.2
+++ tjc_optimize.h 3 Apr 2009 12:30:12 -0000 1.2.2.1
@@ -36,7 +36,7 @@
#include "tjc_normalize.h"
void
-optimize(TJptree_t *ptree, TJpnode_t *node);
+optimize(tjc_config *tjc_c, TJptree_t *ptree, TJpnode_t *node);
#endif /* OPTIMIZE_H */
U tjc_optimize.c
Index: tjc_optimize.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_optimize.c,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- tjc_optimize.c 5 Feb 2009 14:48:35 -0000 1.3.2.1
+++ tjc_optimize.c 3 Apr 2009 12:30:12 -0000 1.3.2.2
@@ -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);
}
U tjc_main.c
Index: tjc_main.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/tjc/tjc_main.c,v
retrieving revision 1.10.2.5
retrieving revision 1.10.2.6
diff -u -d -r1.10.2.5 -r1.10.2.6
--- tjc_main.c 5 Feb 2009 16:17:17 -0000 1.10.2.5
+++ tjc_main.c 3 Apr 2009 12:30:12 -0000 1.10.2.6
@@ -295,7 +295,7 @@
if (DEBUG) stream_printf(GDKout,"#!tjc start normalize\n");
normalize(ptree, root);
if (DEBUG) stream_printf(GDKout,"#!tjc start optimize\n");
- optimize(ptree, root);
+ optimize(tjc_c, ptree, root);
atree = phys_optimize (ptree, root, rtagbat);
// optional dot output
------------------------------------------------------------------------------
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
