X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_icu_9.res;h=5be001a9f95156f5b88c288f993b876d37a5cb0d;hb=9846bbaa45196c9752dc8c1bad78d057ced39bc4;hp=8182c2418c853ab2578582cf2f15a3dc6496efba;hpb=5b31ba8413c62e860eba83a58852d2af37af4397;p=pazpar2-moved-to-github.git

diff --git a/test/test_icu_9.res b/test/test_icu_9.res
index 8182c24..5be001a 100644
--- a/test/test_icu_9.res
+++ b/test/test_icu_9.res
@@ -21,10 +21,15 @@
  <count>1</count>
  <relevance>72241</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(10);
-computer: field=subject vecf[1] += mult(3) / length(1);
+field=title content=The use of passwords for controlled access to com ...;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(8)));
+computer: tf[1] += w[1](6) / length(10) (0.600000);
+field=subject content=Computers;
+computer: w[1] += w(3) / (1+log2(1+lead_decay(0.000000) * length(0)));
+computer: tf[1] += w[1](3) / length(1) (3.600000);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](3.600000) * idf[1](0.200671) (72241);
+computer: relevance += 100000 * tf[1](3.600000) * idf[1](0.200671) (72241);
 score = relevance(72241);
  </relevance_info>
  <recid>content: title the use of passwords for controlled access to computer resources author wood helen m medium book</recid>
@@ -33,7 +38,7 @@ score = relevance(72241);
  <md-title>How to program a computer</md-title>
  <md-author>Jack Collins</md-author>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2788512872">
+    name="Index Data MARC test server" checksum="2614320583">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -41,7 +46,7 @@ score = relevance(72241);
         YYYYYYYYY</md-test-usersetting-2>
  </location>
  <location id="z3950.indexdata.com/marc"
-    name="Index Data MARC test server" checksum="2614320583">
+    name="Index Data MARC test server" checksum="2788512872">
   <md-title>How to program a computer</md-title>
   <md-author>Jack Collins</md-author>
   <md-test-usersetting>XXXXXXXXXX</md-test-usersetting>
@@ -51,10 +56,15 @@ score = relevance(72241);
  <count>2</count>
  <relevance>48160</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(5);
-computer: field=title vecf[1] += mult(6) / length(5);
+field=title content=How to program a computer;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(4)));
+computer: tf[1] += w[1](6) / length(5) (1.200000);
+field=title content=How to program a computer;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(4)));
+computer: tf[1] += w[1](6) / length(5) (2.400000);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](2.400000) * idf[1](0.200671) (48160);
+computer: relevance += 100000 * tf[1](2.400000) * idf[1](0.200671) (48160);
 score = relevance(48160);
  </relevance_info>
  <recid>content: title how to program a computer author jack collins medium book</recid>
@@ -76,9 +86,12 @@ score = relevance(48160);
  <count>1</count>
  <relevance>40134</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(3);
+field=title content=The Computer Bible /;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(1)));
+computer: tf[1] += w[1](6) / length(3) (2.000000);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](2.000000) * idf[1](0.200671) (40134);
+computer: relevance += 100000 * tf[1](2.000000) * idf[1](0.200671) (40134);
 score = relevance(40134);
  </relevance_info>
  <recid>content: title the computer bible author medium book</recid>
@@ -99,9 +112,12 @@ score = relevance(40134);
  <count>1</count>
  <relevance>30100</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(4);
+field=title content=Computer science &amp;amp; technology :;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(0)));
+computer: tf[1] += w[1](6) / length(4) (1.500000);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](1.500000) * idf[1](0.200671) (30100);
+computer: relevance += 100000 * tf[1](1.500000) * idf[1](0.200671) (30100);
 score = relevance(30100);
  </relevance_info>
  <recid>content: title computer science technology author medium book</recid>
@@ -122,9 +138,12 @@ score = relevance(30100);
  <count>1</count>
  <relevance>17200</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(7);
+field=title content=A plan for community college computer development.;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(5)));
+computer: tf[1] += w[1](6) / length(7) (0.857143);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](0.857143) * idf[1](0.200671) (17200);
+computer: relevance += 100000 * tf[1](0.857143) * idf[1](0.200671) (17200);
 score = relevance(17200);
  </relevance_info>
  <recid>content: title a plan for community college computer development author medium book</recid>
@@ -149,9 +168,12 @@ score = relevance(17200);
  <count>1</count>
  <relevance>17200</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(7);
+field=title content=Washington metropolitan area rail computer feasib ...;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(4)));
+computer: tf[1] += w[1](6) / length(7) (0.857143);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](0.857143) * idf[1](0.200671) (17200);
+computer: relevance += 100000 * tf[1](0.857143) * idf[1](0.200671) (17200);
 score = relevance(17200);
  </relevance_info>
  <recid>content: title washington metropolitan area rail computer feasibility study author englund carl r medium book</recid>
@@ -177,9 +199,12 @@ score = relevance(17200);
  <count>1</count>
  <relevance>16722</relevance>
  <relevance_info>
-computer: field=title-remainder vecf[1] += mult(5) / length(6);
+field=title-remainder content=a portfolio of thematic computer maps /;
+computer: w[1] += w(5) / (1+log2(1+lead_decay(0.000000) * length(4)));
+computer: tf[1] += w[1](5) / length(6) (0.833333);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](0.833333) * idf[1](0.200671) (16722);
+computer: relevance += 100000 * tf[1](0.833333) * idf[1](0.200671) (16722);
 score = relevance(16722);
  </relevance_info>
  <recid>content: title the puget sound region author mairs john w medium book</recid>
@@ -202,9 +227,12 @@ score = relevance(16722);
  <count>1</count>
  <relevance>12040</relevance>
  <relevance_info>
-computer: field=title vecf[1] += mult(6) / length(10);
+field=title content=Computer processing of dynamic images from an Ang ...;
+computer: w[1] += w(6) / (1+log2(1+lead_decay(0.000000) * length(0)));
+computer: tf[1] += w[1](6) / length(10) (0.600000);
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](0.600000) * idf[1](0.200671) (12040);
+computer: relevance += 100000 * tf[1](0.600000) * idf[1](0.200671) (12040);
 score = relevance(12040);
  </relevance_info>
  <recid>content: title computer processing of dynamic images from an anger scintillation camera author medium book</recid>
@@ -227,8 +255,9 @@ score = relevance(12040);
  <count>1</count>
  <relevance>0</relevance>
  <relevance_info>
+relevance = 0;
 idf[1] = log(((1 + total(10))/termoccur(9));
-computer: relevance += 100000 * vecf[1](0.000000) * idf[1](0.200671) (0);
+computer: relevance += 100000 * tf[1](0.000000) * idf[1](0.200671) (0);
 score = relevance(0);
  </relevance_info>
  <recid>content: title reconstruction tomography in diagnostic radiology and nuclear medicine author medium book</recid>