Mailing List Archive

Author: creamyg
Date: 2008-08-29 18:33:46 -0700 (Fri, 29 Aug 2008)
New Revision: 3797

Modified:
trunk/c_src/KinoSearch/Search/ANDScorer.bp
trunk/c_src/KinoSearch/Search/ANDScorer.c
trunk/c_src/KinoSearch/Search/NOTScorer.bp
trunk/c_src/KinoSearch/Search/NOTScorer.c
trunk/c_src/KinoSearch/Search/ORScorer.bp
trunk/c_src/KinoSearch/Search/ORScorer.c
trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.bp
trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.c
trunk/c_src/KinoSearch/Search/Scorer.bp
trunk/c_src/KinoSearch/Search/Scorer.c
Log:
Eliminate Scorer_Max_Matchers() and subclass implementations.


Modified: trunk/c_src/KinoSearch/Search/ANDScorer.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/ANDScorer.bp 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/ANDScorer.bp 2008-08-30 01:33:46 UTC (rev 3797)
@@ -35,9 +35,6 @@

public i32_t
Get_Doc_Num(ANDScorer *self);
-
- u32_t
- Max_Matchers(ANDScorer *self);
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Search/ANDScorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/ANDScorer.c 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/ANDScorer.c 2008-08-30 01:33:46 UTC (rev 3797)
@@ -161,12 +161,6 @@
return tally;
}

-u32_t
-ANDScorer_max_matchers(ANDScorer *self)
-{
- return self->num_kids;
-}
-
/* Copyright 2006-2008 Marvin Humphrey
*
* This program is free software; you can redistribute it and/or modify

Modified: trunk/c_src/KinoSearch/Search/NOTScorer.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/NOTScorer.bp 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/NOTScorer.bp 2008-08-30 01:33:46 UTC (rev 3797)
@@ -32,9 +32,6 @@

public i32_t
Get_Doc_Num(NOTScorer *self);
-
- u32_t
- Max_Matchers(NOTScorer *self);
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Search/NOTScorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/NOTScorer.c 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/NOTScorer.c 2008-08-30 01:33:46 UTC (rev 3797)
@@ -96,13 +96,6 @@
return self->tally;
}

-u32_t
-NOTScorer_max_matchers(NOTScorer *self)
-{
- UNUSED_VAR(self);
- return 0;
-}
-
/* Copyright 2007-2008 Marvin Humphrey
*
* This program is free software; you can redistribute it and/or modify

Modified: trunk/c_src/KinoSearch/Search/ORScorer.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/ORScorer.bp 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/ORScorer.bp 2008-08-30 01:33:46 UTC (rev 3797)
@@ -38,9 +38,6 @@

public i32_t
Get_Doc_Num(ORScorer *self);
-
- u32_t
- Max_Matchers(ORScorer *self);
}

/* Copyright 2007-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Search/ORScorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/ORScorer.c 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/ORScorer.c 2008-08-30 01:33:46 UTC (rev 3797)
@@ -159,12 +159,6 @@
return self->tally;
}

-u32_t
-ORScorer_max_matchers(ORScorer *self)
-{
- return self->num_subs;
-}
-
/* Copyright 2007-2008 Marvin Humphrey
*
* This program is free software; you can redistribute it and/or modify

Modified: trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.bp 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.bp 2008-08-30 01:33:46 UTC (rev 3797)
@@ -33,9 +33,6 @@

public i32_t
Get_Doc_Num(RequiredOptionalScorer *self);
-
- u32_t
- Max_Matchers(RequiredOptionalScorer *self);
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.c 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/RequiredOptionalScorer.c 2008-08-30 01:33:46 UTC (rev 3797)
@@ -103,13 +103,6 @@
}
}

-u32_t
-ReqOptScorer_max_matchers(RequiredOptionalScorer *self)
-{
- return Scorer_Max_Matchers(self->opt_scorer)
- + Scorer_Max_Matchers(self->req_scorer);
-}
-
/* Copyright 2007-2008 Marvin Humphrey
*
* This program is free software; you can redistribute it and/or modify

Modified: trunk/c_src/KinoSearch/Search/Scorer.bp
===================================================================
--- trunk/c_src/KinoSearch/Search/Scorer.bp 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/Scorer.bp 2008-08-30 01:33:46 UTC (rev 3797)
@@ -67,13 +67,6 @@
Collect(Scorer *self, HitCollector *collector, i32_t start = 1,
i32_t limit = 0x7FFFFFFF, u32_t hits_per_seg = 0x7FFFFFFF,
I32Array *seg_starts = NULL);
-
- /** Return the maximum number of subscorers that can match. Used by
- * ORScorer/BooleanScorer to calculate maximum coord bonus. Returns 1 by
- * default.
- */
- u32_t
- Max_Matchers(Scorer *self);
}

/* Copyright 2006-2008 Marvin Humphrey

Modified: trunk/c_src/KinoSearch/Search/Scorer.c
===================================================================
--- trunk/c_src/KinoSearch/Search/Scorer.c 2008-08-30 01:20:24 UTC (rev 3796)
+++ trunk/c_src/KinoSearch/Search/Scorer.c 2008-08-30 01:33:46 UTC (rev 3797)
@@ -101,13 +101,6 @@
} while (0 != (doc_num = Scorer_Next(self)) );
}

-u32_t
-Scorer_max_matchers(Scorer *self)
-{
- UNUSED_VAR(self);
- return 1;
-}
-
/* Copyright 2006-2008 Marvin Humphrey
*
* This program is free software; you can redistribute it and/or modify


_______________________________________________
kinosearch-commits mailing list
kinosearch-commits@rectangular.com
http://www.rectangular.com/mailman/listinfo/kinosearch-commits