X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Frank1.c;h=84d41592a1bc4671d8cae7f85eb22751f7d76663;hb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;hp=3369c7925ab997305667b946141dee458823798a;hpb=ce3907338568fce46c5751e7e1091a5ad1c8e291;p=idzebra-moved-to-github.git

diff --git a/index/rank1.c b/index/rank1.c
index 3369c79..84d4159 100644
--- a/index/rank1.c
+++ b/index/rank1.c
@@ -1,10 +1,22 @@
 /*
- * Copyright (C) 1998, Index Data I/S
+ * Copyright (C) 1998-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rank1.c,v $
- * Revision 1.1  1998-03-05 08:45:12  adam
+ * Revision 1.5  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.4  1999/02/02 14:51:01  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.3  1998/06/12 12:21:53  adam
+ * Fixed memory-leak.
+ *
+ * Revision 1.2  1998/03/05 13:03:29  adam
+ * Improved ranking.
+ *
+ * Revision 1.1  1998/03/05 08:45:12  adam
  * New result set model and modular ranking system. Moved towards
  * descent server API. System information stored as "SGML" records.
  *
@@ -12,7 +24,7 @@
 
 #include <stdio.h>
 #include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
@@ -52,7 +64,8 @@ static int log2_int (unsigned g)
  */
 static void *create (ZebraHandle zh)
 {
-    struct rank_class_info *ci = xmalloc (sizeof(*ci));
+    struct rank_class_info *ci = (struct rank_class_info *)
+	xmalloc (sizeof(*ci));
 
     logf (LOG_DEBUG, "rank-1 create");
     return ci;
@@ -65,7 +78,7 @@ static void *create (ZebraHandle zh)
  */
 static void destroy (ZebraHandle zh, void *class_handle)
 {
-    struct rank_class_info *ci = class_handle;
+    struct rank_class_info *ci = (struct rank_class_info *) class_handle;
 
     logf (LOG_DEBUG, "rank-1 destroy");
     xfree (ci);
@@ -79,13 +92,14 @@ static void destroy (ZebraHandle zh, void *class_handle)
  */
 static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
 {
-    struct rank_set_info *si = xmalloc (sizeof(*si));
+    struct rank_set_info *si = (struct rank_set_info *) xmalloc (sizeof(*si));
     int i;
 
     logf (LOG_DEBUG, "rank-1 begin");
     si->no_entries = rset->no_rset_terms;
     si->no_rank_entries = 0;
-    si->entries = xmalloc (sizeof(*si->entries)*si->no_entries);
+    si->entries = (struct rank_term_info *)
+	xmalloc (sizeof(*si->entries)*si->no_entries);
     for (i = 0; i < si->no_entries; i++)
     {
 	int g = rset->rset_terms[i]->nn;
@@ -110,8 +124,9 @@ static void *begin (ZebraHandle zh, void *class_handle, RSET rset)
  */
 static void end (ZebraHandle zh, void *set_handle)
 {
-    struct rank_set_info *si = set_handle;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
     logf (LOG_DEBUG, "rank-1 end");
+    xfree (si->entries);
     xfree (si);
 }
 
@@ -122,7 +137,7 @@ static void end (ZebraHandle zh, void *set_handle)
  */
 static void add (void *set_handle, int seqno, int term_index)
 {
-    struct rank_set_info *si = set_handle;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
     logf (LOG_DEBUG, "rank-1 add seqno=%d term_index=%d", seqno, term_index);
     si->last_pos = seqno;
     si->entries[term_index].local_occur++;
@@ -136,19 +151,21 @@ static void add (void *set_handle, int seqno, int term_index)
  */
 static int calc (void *set_handle, int sysno)
 {
-    int i, lu, score = 0;
-    struct rank_set_info *si = set_handle;
+    int i, lo, divisor, score = 0;
+    struct rank_set_info *si = (struct rank_set_info *) set_handle;
 
     logf (LOG_DEBUG, "rank-1 calc sysno=%d", sysno);
 
     if (!si->no_rank_entries)
 	return -1;
     for (i = 0; i < si->no_entries; i++)
-	if (si->entries[i].rank_flag && (lu = si->entries[i].local_occur))
-	    score += (2+log2_int (lu)) * si->entries[i].global_inv;
-    logf (LOG_DEBUG, " dividend=%d", 60*score);
-    logf (LOG_DEBUG, " divisor=%d", si->no_rank_entries * log2_int (4+si->last_pos));
-    score = (60 * score)/(si->no_rank_entries * log2_int (4+si->last_pos));
+	if (si->entries[i].rank_flag && (lo = si->entries[i].local_occur))
+	    score += (8+log2_int (lo)) * si->entries[i].global_inv;
+    score *= 34;
+    divisor = si->no_rank_entries * (8+log2_int (si->last_pos/si->no_entries));
+    score = score / divisor;
+    if (score > 1000)
+	score = 1000;
     for (i = 0; i < si->no_entries; i++)
 	si->entries[i].local_occur = 0;
     return score;