From b5412d74ad8f1d24b4e0ddce3d3a058b164182cc Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Fri, 6 Aug 2004 14:09:02 +0000 Subject: [PATCH] pos estimates for rsbetween and rsprox --- rset/rsbetween.c | 45 ++++++++++++++++++++++++++++++++++++++++++--- rset/rsbool.c | 6 +++--- rset/rsprox.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 8 deletions(-) diff --git a/rset/rsbetween.c b/rset/rsbetween.c index 774535c..bf63992 100644 --- a/rset/rsbetween.c +++ b/rset/rsbetween.c @@ -1,4 +1,4 @@ -/* $Id: rsbetween.c,v 1.16 2004-08-04 09:59:03 heikki Exp $ +/* $Id: rsbetween.c,v 1.17 2004-08-06 14:09:02 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002 Index Data Aps @@ -38,7 +38,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include #include -#define RSBETWEEN_DEBUG 0 +#define RSBETWEEN_DEBUG 0 static void *r_create_between(RSET ct, const struct rset_control *sel, void *parms); static RSFD r_open_between (RSET ct, int flag); @@ -50,6 +50,7 @@ static int r_forward_between(RSET ct, RSFD rfd, void *buf, int *term_index, const void *untilbuf); static int r_read_between (RSFD rfd, void *buf, int *term_index); static int r_write_between (RSFD rfd, const void *buf); +static void r_pos_between (RSFD rfd, double *current, double *total); static const struct rset_control control_between = { @@ -60,7 +61,7 @@ static const struct rset_control control_between = r_delete_between, r_rewind_between, r_forward_between, /* rset_default_forward, */ - rset_default_pos, + r_pos_between, r_read_between, r_write_between, }; @@ -99,6 +100,7 @@ struct rset_between_rfd { int level; struct rset_between_rfd *next; struct rset_between_info *info; + zint hits; }; #if RSBETWEEN_DEBUG @@ -210,6 +212,7 @@ static RSFD r_open_between (RSET ct, int flag) rfd->buf_attr, &dummy); } rfd->level=0; + rfd->hits=0; return rfd; } @@ -275,6 +278,7 @@ static void r_rewind_between (RSFD rfd) &dummy); } p->level=0; + p->hits=0; } @@ -476,6 +480,7 @@ static int r_read_between (RSFD rfd, void *buf, int *term_index) &p->term_index_m); if (cmp_l == 2) p->level = 0; + p->hits++; return 1; } else if ( ! p->more_l ) /* not in data, no more starts */ @@ -524,3 +529,37 @@ static int r_write_between (RSFD rfd, const void *buf) return -1; } + +static void r_pos_between (RSFD rfd, double *current, double *total) +{ + struct rset_between_rfd *p = (struct rset_between_rfd *) rfd; + struct rset_between_info *info = p->info; + double lcur,ltot; + double mcur,mtot; + double rcur,rtot; + double r; + ltot=-1; rtot=-1; + rset_pos(info->rset_l, p->rfd_l, &lcur, <ot); + rset_pos(info->rset_m, p->rfd_m, &mcur, &mtot); + rset_pos(info->rset_r, p->rfd_r, &rcur, &rtot); + if ( (ltot<0) && (mtot<0) && (rtot<0) ) { /*no position */ + *current=mcur; /* return same as you got */ + *total=mtot; /* probably -1 for not available */ + } + if ( ltot<0) { ltot=0; lcur=0;} /* if only one useful, use it */ + if ( mtot<0) { mtot=0; mcur=0;} + if ( rtot<0) { rtot=0; rcur=0;} + if ( ltot+mtot+rtot < 1 ) { /* empty rset */ + *current=0; + *total=0; + return; + } + r=1.0*(lcur+mcur+rcur)/(ltot+mtot+rtot); /* weighed average of l and r */ + *current=p->hits; + *total=*current/r ; +#if RSBETWEEN_DEBUG + yaz_log(LOG_DEBUG,"betw_pos: (%s/%s) %0.1f/%0.1f= %0.4f ", + info->rset_l->control->desc, info->rset_r->control->desc, + *current, *total, r); +#endif +} diff --git a/rset/rsbool.c b/rset/rsbool.c index ec3831d..736bf18 100644 --- a/rset/rsbool.c +++ b/rset/rsbool.c @@ -1,4 +1,4 @@ -/* $Id: rsbool.c,v 1.36 2004-08-06 12:28:23 adam Exp $ +/* $Id: rsbool.c,v 1.37 2004-08-06 14:09:02 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -55,8 +55,8 @@ static const struct rset_control control_and = r_close, r_delete, r_rewind, - r_forward, /* rset_default_forward, */ - r_pos, /* rset_default_pos */ + r_forward, + r_pos, r_read_and, r_write, }; diff --git a/rset/rsprox.c b/rset/rsprox.c index 2eb7866..555e300 100644 --- a/rset/rsprox.c +++ b/rset/rsprox.c @@ -1,4 +1,4 @@ -/* $Id: rsprox.c,v 1.7 2004-08-06 13:36:24 adam Exp $ +/* $Id: rsprox.c,v 1.8 2004-08-06 14:09:02 heikki Exp $ Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004 Index Data Aps @@ -42,6 +42,7 @@ static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index, const void *untilbuf); static int r_read (RSFD rfd, void *buf, int *term_index); static int r_write (RSFD rfd, const void *buf); +static void r_pos (RSFD rfd, double *current, double *total); static const struct rset_control control_prox = { @@ -52,7 +53,7 @@ static const struct rset_control control_prox = r_delete, r_rewind, r_forward, - rset_default_pos, + r_pos, r_read, r_write, }; @@ -71,6 +72,7 @@ struct rset_prox_rfd { char *more; /* more in each lookahead? */ struct rset_prox_rfd *next; struct rset_prox_info *info; + zint hits; }; static void *r_create (RSET ct, const struct rset_control *sel, void *parms) @@ -159,6 +161,7 @@ static RSFD r_open (RSET ct, int flag) for (i = 0; i < info->p.rset_no; i++) rfd->more[i] = rset_read (info->p.rset[i], rfd->rfd[i], rfd->buf[i], &dummy); + rfd->hits=0; return rfd; } @@ -215,6 +218,7 @@ static void r_rewind (RSFD rfd) rset_rewind (info->p.rset[i], p->rfd[i]); p->more[i] = rset_read (info->p.rset[i], p->rfd[i], p->buf[i], &dummy); } + p->hits=0; } static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, @@ -286,6 +290,7 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, p->more[0] = rset_read (info->p.rset[0], p->rfd[0], p->buf[0], &dummy); + p->hits++; return 1; } } @@ -357,6 +362,7 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, p->more[1] = rset_read (info->p.rset[1], p->rfd[1], p->buf[1], term_index); + p->hits++; return 1; } } @@ -372,6 +378,7 @@ static int r_forward (RSET ct, RSFD rfd, void *buf, int *term_index, static int r_read (RSFD rfd, void *buf, int *term_index) { + { double cur,tot; r_pos(rfd,&cur,&tot); } /*!*/ return r_forward(0, rfd, buf, term_index, 0, 0); } @@ -381,3 +388,36 @@ static int r_write (RSFD rfd, const void *buf) return -1; } +static void r_pos (RSFD rfd, double *current, double *total) +{ + struct rset_prox_info *info = ((struct rset_prox_rfd*)rfd)->info; + struct rset_prox_rfd *p = (struct rset_prox_rfd *) rfd; + int i; + double cur,tot=-1; + double scur=0,stot=0; + double r; + + logf (LOG_DEBUG, "rsprox_pos"); + + for (i = 0; i < info->p.rset_no; i++) + { + rset_pos(info->p.rset[i], p->rfd[i], &cur, &tot); + if (tot>0) { + scur += cur; + stot += tot; + } + } + if (tot <0) { /* nothing found */ + *current=-1; + *total=-1; + } else if (tot <1) { /* most likely tot==0 */ + *current=0; + *total=0; + } else { + r=scur/stot; + *current=p->hits; + *total=*current/r ; + } + logf(LOG_DEBUG,"prox_pos: [%d] %0.1f/%0.1f= %0.4f ", + i,*current, *total, r); +} -- 1.7.10.4