Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24215
Modified Files:
Tag: May2009
pftijah.mx
Log Message:
Backport from HEAD:
Fixed some more PROC signatures after recent changes for having count() type as
wrd instead of int.
Fixed and approved accordingly Tests/test_indexmerge
U pftijah.mx
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.230
retrieving revision 1.230.2.1
diff -u -d -r1.230 -r1.230.2.1
--- pftijah.mx 15 May 2009 09:15:10 -0000 1.230
+++ pftijah.mx 20 May 2009 15:03:05 -0000 1.230.2.1
@@ -2449,7 +2449,7 @@
# where dLH(t) = likelihood of term t in doc d
#
-PROC _score_LM(dbl q_tCnt, int c_tCnt, int cSize, BAT[oid,int] e_tCnt,
BAT[void,int] e_size) : bat[oid,dbl] {
+PROC _score_LM(dbl q_tCnt, wrd c_tCnt, wrd cSize, BAT[oid,int] e_tCnt,
BAT[void,int] e_size) : bat[oid,dbl] {
var e_tScores := e_tCnt.[dbl]().access(BAT_WRITE);
e_tScores.left_div(e_size);
e_tScores := [log](e_tScores);
@@ -2468,7 +2468,7 @@
# where cLH(t) = likelihood of term t in (background) collection c
#
-PROC _score_LMs(dbl q_tCnt, int c_tCnt, int cSize, BAT[oid,int] e_tCnt,
BAT[void,int] e_size) : bat[oid,dbl] {
+PROC _score_LMs(dbl q_tCnt, wrd c_tCnt, wrd cSize, BAT[oid,int] e_tCnt,
BAT[void,int] e_size) : bat[oid,dbl] {
var tmp1 := c_lambda * c_tCnt / dbl(cSize);
var tmp2 := dbl(1) - c_lambda;
@@ -2493,7 +2493,7 @@
# where cLH(t) = likelihood of term t in (background) collection c
#
-PROC _score_NLLR(dbl q_tCnt, dbl qSize, int c_tCnt, int cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size) : bat[oid,dbl] {
+PROC _score_NLLR(dbl q_tCnt, dbl qSize, wrd c_tCnt, wrd cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size) : bat[oid,dbl] {
var collFac := ((dbl(1) - c_lambda) / c_lambda) * cSize / dbl(c_tCnt);
var q_tLH := q_tCnt / qSize;
var e_tScores := e_tCnt.[dbl]().access(BAT_WRITE);
@@ -2518,7 +2518,7 @@
# where cB = tuning parameter b
#
-PROC _score_OKAPI(dbl q_tCnt, BAT[oid,int] e_tCnt, BAT[void,int] e_size, int
cNdoc, dbl cAvgDL) : bat[oid,dbl] {
+PROC _score_OKAPI(dbl q_tCnt, BAT[oid,int] e_tCnt, BAT[void,int] e_size, wrd
cNdoc, dbl cAvgDL) : bat[oid,dbl] {
# cIDF contains Robertson/Sparck-Jones relevance weight
var cIDF := e_tCnt.count_wrd(); # df
@@ -3572,7 +3572,7 @@
# documents if one or more terms have zero frequency in background-col
# which should not happen
-PROC _score_LM(int q_tCnt, wrd qSize, wrd c_tCnt, int cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
+PROC _score_LM(int q_tCnt, wrd qSize, wrd c_tCnt, wrd cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
var e_tScores := e_tCnt.[dbl]().access(BAT_WRITE);
e_tScores.left_div(e_size);
var tmp := e_tScores;
@@ -3593,7 +3593,7 @@
# where cLH(t) = likelihood of term t in (background) collection c
#
-PROC _score_LMs(int q_tCnt, wrd qSize, wrd c_tCnt, int cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
+PROC _score_LMs(int q_tCnt, wrd qSize, wrd c_tCnt, wrd cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
var tmp1 := cLambda * c_tCnt / dbl(cSize);
var tmp2 := dbl(1) - cLambda;
var e_tScores := e_tCnt.[dbl]().access(BAT_WRITE);
@@ -3618,7 +3618,7 @@
# where cLH(t) = likelihood of term t in (background) collection c
#
-PROC _score_NLLR(int q_tCnt, wrd qSize, wrd c_tCnt, int cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
+PROC _score_NLLR(int q_tCnt, wrd qSize, wrd c_tCnt, wrd cSize, BAT[oid,int]
e_tCnt, BAT[void,int] e_size, dbl cLambda) : bat[oid,dbl] {
var collFac := ((dbl(1) - cLambda) / cLambda) * cSize / dbl(c_tCnt);
var q_tLH := dbl(q_tCnt) / dbl(qSize);
var e_tScores := e_tCnt.[dbl]().access(BAT_WRITE);
@@ -3643,7 +3643,7 @@
# where cB = tuning parameter b
#
-PROC _score_OKAPI(int q_tCnt, BAT[oid,int] e_tCnt, BAT[void,int] e_size, int
cNdoc, dbl cAvgDL, dbl cK1, dbl cB) : bat[oid,dbl] {
+PROC _score_OKAPI(int q_tCnt, BAT[oid,int] e_tCnt, BAT[void,int] e_size, wrd
cNdoc, dbl cAvgDL, dbl cK1, dbl cB) : bat[oid,dbl] {
# cIDF contains Robertson/Sparck-Jones relevance weight
var cIDF := e_tCnt.count_wrd(); # df
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
