X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rset%2Frsrel.c;h=a02fb232226c7fe3af03dcef3a7cfce007a91087;hb=d79f0901b184c1bcf383be8500aee3cfd197ca1d;hp=16efb8e57dd1ecbdba13f0e7aa60a72d301b961d;hpb=80eb0a73f541530f383715296203036b3adbacc2;p=idzebra-moved-to-github.git

diff --git a/rset/rsrel.c b/rset/rsrel.c
index 16efb8e..a02fb23 100644
--- a/rset/rsrel.c
+++ b/rset/rsrel.c
@@ -1,11 +1,52 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rsrel.c,v $
- * Revision 1.10  1996-06-11 10:54:29  quinn
- * Relevance work
+ * Revision 1.23  1998-01-07 13:53:41  adam
+ * Queries using simple ranked operands returns right number of hits.
+ *
+ * Revision 1.22  1997/12/18 10:54:25  adam
+ * New method result set method rs_hits that returns the number of
+ * hits in result-set (if known). The ranked result set returns real
+ * number of hits but only when not combined with other operands.
+ *
+ * Revision 1.21  1997/11/18 10:05:08  adam
+ * Changed character map facility so that admin can specify character
+ * mapping files for each register type, w, p, etc.
+ *
+ * Revision 1.20  1997/10/31 12:37:55  adam
+ * Code calls xfree() instead of free().
+ *
+ * Revision 1.19  1997/10/01 11:44:06  adam
+ * Small improvement of new ranking.
+ *
+ * Revision 1.18  1997/09/24 13:36:41  adam
+ * More work on new ranking algorithm.
+ *
+ * Revision 1.17  1997/09/22 12:39:07  adam
+ * Added get_pos method for the ranked result sets.
+ *
+ * Revision 1.16  1997/09/17 12:19:23  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.15  1997/09/09 13:38:16  adam
+ * Partial port to WIN95/NT.
+ *
+ * Revision 1.14  1996/11/08 11:15:58  adam
+ * Compressed isam fully supported.
+ *
+ * Revision 1.13  1996/10/29 13:55:26  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.12  1996/10/08 13:00:40  adam
+ * Bug fix: result sets with ranked operands in boolean operations weren't
+ * sorted.
+ *
+ * Revision 1.11  1996/10/07  16:05:29  quinn
+ * Work.
  *
  * Revision 1.9  1995/12/11  09:15:26  adam
  * New set types: sand/sor/snot - ranked versions of and/or/not in
@@ -44,11 +85,13 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <assert.h>
 
 #include <isam.h>
+#include <isamc.h>
 #include <rsrel.h>
-#include <alexutil.h>
+#include <zebrautl.h>
 
 static void *r_create(const struct rset_control *sel, void *parms,
                       int *flags);
@@ -57,6 +100,7 @@ static void r_close (RSFD rfd);
 static void r_delete (RSET ct);
 static void r_rewind (RSFD rfd);
 static int r_count (RSET ct);
+static int r_hits (RSET ct, void *oi);
 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);
@@ -70,6 +114,7 @@ static const rset_control control =
     r_delete,
     r_rewind,
     r_count,
+    r_hits,
     r_read,
     r_write,
     r_score
@@ -81,11 +126,21 @@ struct rset_rel_info {
     int     key_size;
     int     max_rec;
     int     no_rec;
+    int     hits;                       /* hits count */
     int     (*cmp)(const void *p1, const void *p2);
+    int     (*get_pos)(const void *p);
     char    *key_buf;                   /* key buffer */
     float   *score_buf;                 /* score buffer */
     int     *sort_idx;                  /* score sorted index */
-    int     *sysno_idx;                /* sysno sorted index (ring buffer) */
+    int     *sysno_idx;                 /* sysno sorted index (ring buffer) */
+    int     no_isam_positions;
+    ISAM    is;
+    ISAMC   isc;
+    ISAM_P  *isam_positions;
+    int     no_terms;
+    int     *term_no;
+
+    int     method;
     struct rset_rel_rfd *rfd_list;
 };
 
@@ -101,6 +156,7 @@ static void add_rec (struct rset_rel_info *info, double score, void *key)
 {
     int idx, i, j;
 
+    (info->hits)++;
     for (i = 0; i<info->no_rec; i++)
     {
         idx = info->sort_idx[i];
@@ -141,102 +197,200 @@ static int qcomp (const void *p1, const void *p2)
                             qsort_info->key_buf + i2*qsort_info->key_size);
 }
 
+#define NEW_RANKING 0
+
 #define SCORE_SHOW 0.0                       /* base score for showing up */
 #define SCORE_COOC 0.3                       /* component dependent on co-oc */
 #define SCORE_DYN  (1-(SCORE_SHOW+SCORE_COOC)) /* dynamic component of score */
 
-static void relevance (struct rset_rel_info *info, rset_relevance_parms *parms)
+static void relevance (struct rset_rel_info *info)
 {
     char **isam_buf;
     char *isam_tmp_buf;
     int  *isam_r;
     int  *max_tf, *tf;
-    ISPT *isam_pt;
+
+    int  *pos_tf = NULL;
+    int score_sum = 0;
+    int no_occur = 0;
+    char *isam_prev_buf = NULL;
+    int fact1, fact2;
+
+    ISPT *isam_pt = NULL;
+    ISAMC_PP *isamc_pp = NULL;
     int i;
 
     logf (LOG_DEBUG, "relevance");
-    isam_buf = xmalloc (parms->no_isam_positions * sizeof(*isam_buf));
-    isam_r = xmalloc (sizeof (*isam_r) * parms->no_isam_positions);
-    isam_pt = xmalloc (sizeof (*isam_pt) * parms->no_isam_positions);
+    isam_buf = xmalloc (info->no_isam_positions * sizeof(*isam_buf));
+    isam_r = xmalloc (sizeof (*isam_r) * info->no_isam_positions);
+    if (info->is)
+        isam_pt = xmalloc (sizeof (*isam_pt) * info->no_isam_positions);
+    else if (info->isc)
+        isamc_pp = xmalloc (sizeof (*isamc_pp) * info->no_isam_positions);
+    else
+    {
+        logf (LOG_FATAL, "No isamc or isam in rs_rel");
+        abort ();
+    }
     isam_tmp_buf = xmalloc (info->key_size);
-    max_tf = xmalloc (sizeof (*max_tf) * parms->no_terms);
-    tf = xmalloc (sizeof (*tf) * parms->no_terms);
+    max_tf = xmalloc (sizeof (*max_tf) * info->no_terms);
+    tf = xmalloc (sizeof (*tf) * info->no_terms);
 
-    for (i = 0; i<parms->no_terms; i++)
+    for (i = 0; i<info->no_terms; i++)
 	max_tf[i] = 0;
-    for (i = 0; i<parms->no_isam_positions; i++)
+    for (i = 0; i < info->no_isam_positions; i++)
     {
         isam_buf[i] = xmalloc (info->key_size);
-        isam_pt[i] = is_position (parms->is, parms->isam_positions[i]);
-        max_tf [parms->term_no[i]] = is_numkeys (isam_pt[i]);
-        isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+        if (isam_pt)
+        {
+            isam_pt[i] = is_position (info->is, info->isam_positions[i]);
+            max_tf [info->term_no[i]] = is_numkeys (isam_pt[i]);
+            isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+        } 
+        else if (isamc_pp)
+        {
+            isamc_pp[i] = isc_pp_open (info->isc, info->isam_positions[i]);
+            max_tf [info->term_no[i]] = isc_pp_num (isamc_pp[i]);
+            isam_r[i] = isc_pp_read (isamc_pp[i], isam_buf[i]);
+        }
         logf (LOG_DEBUG, "max tf %d = %d", i, max_tf[i]);
     }
-    while (1)
+    switch (info->method)
     {
-        int min = -1, i, r;
-        double score;
-	int co_oc, last_term;    /* Number of co-occurrences */
-
-	last_term = -1;
-        /* find min with lowest sysno */
-        for (i = 0; i<parms->no_isam_positions; i++)
+    case RSREL_METHOD_B:
+	while (1)
 	{
-            if (isam_r[i] && 
-               (min < 0 || (r = (*parms->cmp)(isam_buf[i], isam_buf[min])) < 2))
+	    int r, min = -1;
+	    int pos = 0;
+	    for (i = 0; i<info->no_isam_positions; i++)
+		if (isam_r[i] && 
+		    (min < 0 ||
+		     (r = (*info->cmp)(isam_buf[i], isam_buf[min])) < 1))
+		    min = i;
+	    if (!isam_prev_buf)
 	    {
-                min = i;
-		co_oc = 1;
+		pos_tf = xmalloc (sizeof(*pos_tf) * info->no_isam_positions);
+		isam_prev_buf = xmalloc (info->key_size);
+		fact1 = 100000/info->no_isam_positions;
+		fact2 = 100000/
+		    (info->no_isam_positions*info->no_isam_positions);
+		
+		no_occur = score_sum = 0;
+		memcpy (isam_prev_buf, isam_buf[min], info->key_size);
+		for (i = 0; i<info->no_isam_positions; i++)
+		    pos_tf[i] = -10;
 	    }
-	    else if (!r && last_term != parms->term_no[i]) /* new occurrence */
-		    co_oc++;
-	    last_term = parms->term_no[i];
-	}
-
-        if (min < 0)
-            break;
-        memcpy (isam_tmp_buf, isam_buf[min], info->key_size);
-        /* calculate for all with those sysno */
-	for (i = 0; i < parms->no_terms; i++)
-	    tf[i] = 0;
-        for (i = 0; i<parms->no_isam_positions; i++)
-        {
-            int r;
-            
-            if (isam_r[i])
-                r = (*parms->cmp)(isam_buf[i], isam_tmp_buf);
-            else 
-                r = 2;
-#if 0
-            if (r > 1 || r < -1)
-                wgt[parms->term_no[i]] = 0.0;
-#endif
-	    if (r <= 1 && r >= -1)
-            {
-                do
-                {
-                    tf[parms->term_no[i]]++;
-                    isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
-                } while (isam_r[i] && 
-                         (*parms->cmp)(isam_buf[i], isam_tmp_buf) <= 1);
-            }
-        }
-        /* calculate relevance value */
-        score = 0.0;
-        for (i = 0; i<parms->no_terms; i++)
-            if (tf[i])
-		score += SCORE_SHOW + SCORE_COOC*co_oc/parms->no_terms +
-		    SCORE_DYN*tf[i]/max_tf[i];
-        /* if value is in the top score, then save it - don't emit yet */
-        add_rec (info, score/parms->no_terms, isam_tmp_buf);
-    }
+	    else if (min < 0 ||
+		     (*info->cmp)(isam_buf[min], isam_prev_buf) > 1)
+	    {
+		logf (LOG_LOG, "final occur = %d ratio=%d",
+		      no_occur, score_sum / no_occur);
+		add_rec (info, score_sum / (10000.0*no_occur), isam_prev_buf);
+		if (min < 0)
+		    break;
+		no_occur = score_sum = 0;
+		memcpy (isam_prev_buf, isam_buf[min], info->key_size);
+		for (i = 0; i<info->no_isam_positions; i++)
+		    pos_tf[i] = -10;
+	    }
+	    pos = (*info->get_pos)(isam_buf[min]);
+	    logf (LOG_LOG, "pos=%d", pos);
+	    for (i = 0; i<info->no_isam_positions; i++)
+	    {
+		int d = pos - pos_tf[i];
+		
+		no_occur++;
+		if (pos_tf[i] < 0 && i != min)
+		    continue;
+		if (d < 10)
+		    d = 10;
+		if (i == min)
+		    score_sum += fact2 / d;
+		else
+		    score_sum += fact1 / d;
+	    }
+	    pos_tf[min] = pos;
+	    logf (LOG_LOG, "score_sum = %d", score_sum);
+	    i = min;
+	    if (isam_pt)
+		isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+	    else if (isamc_pp)
+		isam_r[i] = isc_pp_read (isamc_pp[i], isam_buf[i]);
+	} /* while */
+	xfree (isam_prev_buf);
+	xfree (pos_tf);
+	break;
+    case RSREL_METHOD_A:
+	while (1)
+	{
+	    int min = -1, i, r;
+	    double score;
+	    int co_oc, last_term;    /* Number of co-occurrences */
+	    
+	    last_term = -1;
+	    /* find min with lowest sysno */
+	    for (i = 0; i<info->no_isam_positions; i++)
+	    {
+		if (isam_r[i] && 
+		    (min < 0
+		     || (r = (*info->cmp)(isam_buf[i], isam_buf[min])) < 2))
+		{
+		    min = i;
+		    co_oc = 1;
+		}
+		else if (!r && last_term != info->term_no[i]) 
+		    co_oc++;  /* new occurrence */
+		last_term = info->term_no[i];
+	    }
+	    
+	    if (min < 0)
+		break;
+	    memcpy (isam_tmp_buf, isam_buf[min], info->key_size);
+	    /* calculate for all with those sysno */
+	    for (i = 0; i < info->no_terms; i++)
+		tf[i] = 0;
+	    for (i = 0; i<info->no_isam_positions; i++)
+	    {
+		int r;
+		
+		if (isam_r[i])
+		    r = (*info->cmp)(isam_buf[i], isam_tmp_buf);
+		else 
+		    r = 2;
+		if (r <= 1 && r >= -1)
+		{
+		    do
+		    {
+			tf[info->term_no[i]]++;
+			if (isam_pt)
+			    isam_r[i] = is_readkey (isam_pt[i], isam_buf[i]);
+			else if (isamc_pp)
+			    isam_r[i] = isc_pp_read (isamc_pp[i], isam_buf[i]);
+		    } while (isam_r[i] && 
+			     (*info->cmp)(isam_buf[i], isam_tmp_buf) <= 1);
+		}
+	    }
+	    /* calculate relevance value */
+	    score = 0.0;
+	    for (i = 0; i<info->no_terms; i++)
+		if (tf[i])
+		    score += SCORE_SHOW + SCORE_COOC*co_oc/info->no_terms +
+			SCORE_DYN*tf[i]/max_tf[i];
+	    /* if value is in the top score, then save it - don't emit yet */
+	    add_rec (info, score/info->no_terms, isam_tmp_buf);
+	} /* while */
+	break;
+    } /* switch */
     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++)
+    for (i = 0; i<info->no_isam_positions; i++)
     {
-        is_pt_free (isam_pt[i]);
+        if (isam_pt)
+            is_pt_free (isam_pt[i]);
+        if (isamc_pp)
+            isc_pp_close (isamc_pp[i]);
         xfree (isam_buf[i]);
     }
     xfree (max_tf);
@@ -244,31 +398,47 @@ static void relevance (struct rset_rel_info *info, rset_relevance_parms *parms)
     xfree (isam_buf);
     xfree (isam_r);
     xfree (isam_pt);
+    xfree (isamc_pp);
     xfree(tf);
 }
 
-static void *r_create (const struct rset_control *sel, void *parms,
+static void *r_create (const struct rset_control *sel, void *v_parms,
                        int *flags)
 {
-    rset_relevance_parms *r_parms = parms;
+    rset_relevance_parms *parms = v_parms;
     struct rset_rel_info *info;
 
     *flags |= RSET_FLAG_RANKED;
     info = xmalloc (sizeof(struct rset_rel_info));
-    info->key_size = r_parms->key_size;
+    info->key_size = parms->key_size;
     assert (info->key_size > 1);
-    info->max_rec = r_parms->max_rec;
+    info->max_rec = parms->max_rec;
     assert (info->max_rec > 1);
-    info->cmp = r_parms->cmp;
-
+    info->cmp = parms->cmp;
+    info->get_pos = parms->get_pos;
+
+    info->method = parms->method;
+    info->no_isam_positions = parms->no_isam_positions;
+    info->isam_positions =
+	xmalloc (sizeof(*info->isam_positions)*parms->no_isam_positions);
+    memcpy (info->isam_positions, parms->isam_positions,
+	    sizeof(*info->isam_positions) * parms->no_isam_positions);
+    info->is = parms->is;
+    info->isc = parms->isc;
+    info->no_terms = parms->no_terms;
+    info->term_no = xmalloc (sizeof(*info->term_no)*parms->no_isam_positions);
+    memcpy (info->term_no, parms->term_no,
+	    sizeof(*info->term_no)*parms->no_isam_positions);
+    
     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->hits = 0;
     info->rfd_list = NULL;
 
-    relevance (info, r_parms);
+    relevance (info);
     return info;
 }
 
@@ -300,7 +470,7 @@ static void r_close (RSFD rfd)
         if (*rfdp == rfd)
         {
             *rfdp = (*rfdp)->next;
-            free (rfd);
+            xfree (rfd);
             return;
         }
     logf (LOG_FATAL, "r_close but no rfd match!");
@@ -316,6 +486,8 @@ static void r_delete (RSET ct)
     xfree (info->score_buf);
     xfree (info->sort_idx);
     xfree (info->sysno_idx);
+    xfree (info->isam_positions);
+    xfree (info->term_no);
     xfree (info);
 }
 
@@ -337,6 +509,13 @@ static int r_count (RSET ct)
     return info->no_rec;
 }
 
+static int r_hits (RSET ct, void *oi)
+{
+    struct rset_rel_info *info = ct->buf;
+
+    return info->hits;
+}
+
 static int r_read (RSFD rfd, void *buf)
 {
     struct rset_rel_rfd *p = rfd;