* Sebastian Hammer, Adam Dickmeiss
*
* $Log: rsrel.c,v $
- * Revision 1.4 1995-09-14 07:48:56 adam
+ * Revision 1.8 1995-12-05 11:25:45 adam
+ * Doesn't include math.h.
+ *
+ * Revision 1.7 1995/10/12 12:41:57 adam
+ * Private info (buf) moved from struct rset_control to struct rset.
+ * Bug fixes in relevance.
+ *
+ * Revision 1.6 1995/10/10 14:00:04 adam
+ * Function rset_open changed its wflag parameter to general flags.
+ *
+ * Revision 1.5 1995/10/06 14:38:06 adam
+ * New result set method: r_score.
+ * Local no (sysno) and score is transferred to retrieveCtrl.
+ *
+ * Revision 1.4 1995/09/14 07:48:56 adam
* Other score calculation.
*
* Revision 1.3 1995/09/11 15:23:40 adam
#include <stdio.h>
#include <stdlib.h>
-#include <math.h>
#include <assert.h>
#include <isam.h>
#include <rsrel.h>
#include <alexutil.h>
-static rset_control *r_create(const struct rset_control *sel, void *parms);
-static RSFD r_open (rset_control *ct, int wflag);
+static void *r_create(const struct rset_control *sel, void *parms);
+static RSFD r_open (RSET ct, int flag);
static void r_close (RSFD rfd);
-static void r_delete (rset_control *ct);
+static void r_delete (RSET ct);
static void r_rewind (RSFD rfd);
-static int r_count (rset_control *ct);
+static int r_count (RSET ct);
static int r_read (RSFD rfd, void *buf);
static int r_write (RSFD rfd, const void *buf);
+static int r_score (RSFD rfd, int *score);
static const rset_control control =
{
"relevance set type",
- 0,
r_create,
r_open,
r_close,
r_rewind,
r_count,
r_read,
- r_write
+ r_write,
+ r_score
};
const rset_control *rset_kind_relevance = &control;
int max_rec;
int no_rec;
int (*cmp)(const void *p1, const void *p2);
- char *key_buf;
- float *score_buf;
- int *sort_idx;
-
+ char *key_buf; /* key buffer */
+ float *score_buf; /* score buffer */
+ int *sort_idx; /* score sorted index */
+ int *sysno_idx; /* sysno sorted index (ring buffer) */
struct rset_rel_rfd *rfd_list;
};
struct rset_rel_rfd {
+ int last_read_pos;
int position;
+ int flag;
struct rset_rel_rfd *next;
struct rset_rel_info *info;
};
{
int idx, i, j;
- logf (LOG_DEBUG, "add %f", score);
for (i = 0; i<info->no_rec; i++)
{
idx = info->sort_idx[i];
break;
}
if (info->no_rec < info->max_rec)
- {
+ { /* there is room for this entry */
for (j = info->no_rec; j > i; --j)
info->sort_idx[j] = info->sort_idx[j-1];
idx = info->sort_idx[j] = info->no_rec;
++(info->no_rec);
}
else if (i == 0)
- return;
+ return; /* score too low */
else
{
- idx = info->sort_idx[0];
+ idx = info->sort_idx[0]; /* remove this entry */
--i;
- for (j = 0; j < i; ++j)
+ for (j = 0; j < i; ++j) /* make room */
info->sort_idx[j] = info->sort_idx[j+1];
- info->sort_idx[j] = idx;
+ info->sort_idx[j] = idx; /* allocate sort entry */
}
memcpy (info->key_buf + idx*info->key_size, key, info->key_size);
info->score_buf[idx] = score;
}
+
+static struct rset_rel_info *qsort_info;
+
+static int qcomp (const void *p1, const void *p2)
+{
+ int i1 = *(int*) p1;
+ int i2 = *(int*) p2;
+
+ return qsort_info->cmp (qsort_info->key_buf + i1*qsort_info->key_size,
+ qsort_info->key_buf + i2*qsort_info->key_size);
+}
+
static void relevance (struct rset_rel_info *info, rset_relevance_parms *parms)
{
char **isam_buf;
/* if value is in the top score, then save it - don't emit yet */
add_rec (info, score, isam_tmp_buf);
}
+ for (i = 0; i<info->no_rec; i++)
+ info->sysno_idx[i] = i;
+ qsort_info = info;
+ qsort (info->sysno_idx, info->no_rec, sizeof(*info->sysno_idx), qcomp);
for (i = 0; i<parms->no_isam_positions; i++)
{
is_pt_free (isam_pt[i]);
xfree (wgt);
}
-static rset_control *r_create (const struct rset_control *sel, void *parms)
+static void *r_create (const struct rset_control *sel, void *parms)
{
- rset_control *newct;
rset_relevance_parms *r_parms = parms;
struct rset_rel_info *info;
- newct = xmalloc(sizeof(*newct));
- memcpy(newct, sel, sizeof(*sel));
- newct->buf = xmalloc (sizeof(struct rset_rel_info));
-
- info = newct->buf;
+ info = xmalloc (sizeof(struct rset_rel_info));
info->key_size = r_parms->key_size;
assert (info->key_size > 1);
info->max_rec = r_parms->max_rec;
info->key_buf = xmalloc (info->key_size * info->max_rec);
info->score_buf = xmalloc (sizeof(*info->score_buf) * info->max_rec);
info->sort_idx = xmalloc (sizeof(*info->sort_idx) * info->max_rec);
+ info->sysno_idx = xmalloc (sizeof(*info->sysno_idx) * info->max_rec);
info->no_rec = 0;
info->rfd_list = NULL;
relevance (info, r_parms);
- return newct;
+ return info;
}
-static RSFD r_open (rset_control *ct, int wflag)
+static RSFD r_open (RSET ct, int flag)
{
struct rset_rel_rfd *rfd;
struct rset_rel_info *info = ct->buf;
- if (wflag)
+ if (flag & RSETF_WRITE)
{
logf (LOG_FATAL, "relevance set type is read-only");
return NULL;
}
rfd = xmalloc (sizeof(*rfd));
+ rfd->flag = flag;
rfd->next = info->rfd_list;
- info->rfd_list = rfd;
- rfd->position = info->no_rec;
rfd->info = info;
+ info->rfd_list = rfd;
+ r_rewind (rfd);
return rfd;
}
assert (0);
}
-static void r_delete (rset_control *ct)
+static void r_delete (RSET ct)
{
struct rset_rel_info *info = ct->buf;
xfree (info->key_buf);
xfree (info->score_buf);
xfree (info->sort_idx);
+ xfree (info->sysno_idx);
xfree (info);
xfree (ct);
}
{
struct rset_rel_rfd *p = rfd;
struct rset_rel_info *info = p->info;
-
- p->position = info->no_rec;
+
+ if (p->flag & RSETF_SORT_RANK)
+ p->position = info->no_rec;
+ else
+ p->position = 0;
}
-static int r_count (rset_control *ct)
+static int r_count (RSET ct)
{
struct rset_rel_info *info = ct->buf;
struct rset_rel_rfd *p = rfd;
struct rset_rel_info *info = p->info;
- if (p->position <= 0)
- return 0;
- --(p->position);
- logf (LOG_DEBUG, "score: %f",
- info->score_buf[info->sort_idx[p->position]]);
+ if (p->flag & RSETF_SORT_RANK)
+ {
+ if (p->position <= 0)
+ return 0;
+ --(p->position);
+ p->last_read_pos = info->sort_idx[p->position];
+ }
+ else
+ {
+ if (p->position == info->no_rec)
+ return 0;
+ p->last_read_pos = info->sysno_idx[p->position];
+ ++(p->position);
+ }
memcpy ((char*) buf,
- info->key_buf + info->key_size * info->sort_idx[p->position],
+ info->key_buf + info->key_size * p->last_read_pos,
info->key_size);
return 1;
}
+static int r_score (RSFD rfd, int *score)
+{
+ struct rset_rel_rfd *p = rfd;
+ struct rset_rel_info *info = p->info;
+
+ *score = (int) (1000*info->score_buf[p->last_read_pos]);
+ return 1;
+}
+
static int r_write (RSFD rfd, const void *buf)
{
logf (LOG_FATAL, "relevance set type is read-only");