Ignore:
Timestamp:
2004-11-29T15:43:11+13:00 (19 years ago)
Author:
kjdon
Message:

Added the changes from Emanuel Dejanu (Simple Words) - mostly efficiency changes. For example, changing i++ to ++i, delete xxx to delete []xxx, some stuff to do with UCArrays...

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/indexers/mgpp/text/QueryTester.cpp

    r3365 r8692  
    4949  DocNumArray &docSet1 = setNode1->queryResult.docs;
    5050  RankArray &rankSet1 = setNode1->queryResult.ranks;
    51   docSet1.push_back (1);  rankSet1.push_back (0.1);
    52   docSet1.push_back (10); rankSet1.push_back (0.2);
    53   docSet1.push_back (15); rankSet1.push_back (0.2);
    54   docSet1.push_back (18); rankSet1.push_back (0.4);
    55   docSet1.push_back (19); rankSet1.push_back (0.5);
     51  docSet1.push_back (1);  rankSet1.push_back (0.1f);
     52  docSet1.push_back (10); rankSet1.push_back (0.2f);
     53  docSet1.push_back (15); rankSet1.push_back (0.2f);
     54  docSet1.push_back (18); rankSet1.push_back (0.4f);
     55  docSet1.push_back (19); rankSet1.push_back (0.5f);
    5656
    5757  SetQueryNode *setNode2 = new SetQueryNode;
    5858  DocNumArray &docSet2 = setNode2->queryResult.docs;
    5959  RankArray &rankSet2 = setNode2->queryResult.ranks;
    60   docSet2.push_back (2);  rankSet2.push_back (0.1);
    61   docSet2.push_back (11); rankSet2.push_back (0.2);
    62   docSet2.push_back (12); rankSet2.push_back (0.3);
    63   docSet2.push_back (13); rankSet2.push_back (0.4);
    64   docSet2.push_back (14); rankSet2.push_back (0.5);
    65   docSet2.push_back (15); rankSet2.push_back (0.6);
    66   docSet2.push_back (16); rankSet2.push_back (0.7);
    67   docSet2.push_back (17); rankSet2.push_back (0.8);
    68   docSet2.push_back (19); rankSet2.push_back (0.9);
    69   docSet2.push_back (20); rankSet2.push_back (0.1);
    70   docSet2.push_back (21); rankSet2.push_back (0.2);
     60  docSet2.push_back (2);  rankSet2.push_back (0.1f);
     61  docSet2.push_back (11); rankSet2.push_back (0.2f);
     62  docSet2.push_back (12); rankSet2.push_back (0.3f);
     63  docSet2.push_back (13); rankSet2.push_back (0.4f);
     64  docSet2.push_back (14); rankSet2.push_back (0.5f);
     65  docSet2.push_back (15); rankSet2.push_back (0.6f);
     66  docSet2.push_back (16); rankSet2.push_back (0.7f);
     67  docSet2.push_back (17); rankSet2.push_back (0.8f);
     68  docSet2.push_back (19); rankSet2.push_back (0.9f);
     69  docSet2.push_back (20); rankSet2.push_back (0.1f);
     70  docSet2.push_back (21); rankSet2.push_back (0.2f);
    7171
    7272  cout << "\n" << setNode1->queryResult << "AND\n\n"
    … …  
    170170  DocNumArray &docSet1 = setNode1->queryResult.docs;
    171171  RankArray &rankSet1 = setNode1->queryResult.ranks;
    172   docSet1.push_back (1);  rankSet1.push_back (0.1);
    173   docSet1.push_back (10); rankSet1.push_back (0.2);
    174   docSet1.push_back (15); rankSet1.push_back (0.2);
    175   docSet1.push_back (18); rankSet1.push_back (0.4);
    176   docSet1.push_back (19); rankSet1.push_back (0.5);
     172  docSet1.push_back (1);  rankSet1.push_back (0.1f);
     173  docSet1.push_back (10); rankSet1.push_back (0.2f);
     174  docSet1.push_back (15); rankSet1.push_back (0.2f);
     175  docSet1.push_back (18); rankSet1.push_back (0.4f);
     176  docSet1.push_back (19); rankSet1.push_back (0.5f);
    177177
    178178  SetQueryNode *setNode2 = new SetQueryNode;
    179179  DocNumArray &docSet2 = setNode2->queryResult.docs;
    180180  RankArray &rankSet2 = setNode2->queryResult.ranks;
    181   docSet2.push_back (2);  rankSet2.push_back (0.1);
    182   docSet2.push_back (11); rankSet2.push_back (0.2);
    183   docSet2.push_back (12); rankSet2.push_back (0.3);
    184   docSet2.push_back (13); rankSet2.push_back (0.4);
    185   docSet2.push_back (14); rankSet2.push_back (0.5);
    186   docSet2.push_back (15); rankSet2.push_back (0.6);
    187   docSet2.push_back (16); rankSet2.push_back (0.7);
    188   docSet2.push_back (17); rankSet2.push_back (0.8);
    189   docSet2.push_back (19); rankSet2.push_back (0.9);
    190   docSet2.push_back (20); rankSet2.push_back (0.1);
    191   docSet2.push_back (21); rankSet2.push_back (0.2);
     181  docSet2.push_back (2);  rankSet2.push_back (0.1f);
     182  docSet2.push_back (11); rankSet2.push_back (0.2f);
     183  docSet2.push_back (12); rankSet2.push_back (0.3f);
     184  docSet2.push_back (13); rankSet2.push_back (0.4f);
     185  docSet2.push_back (14); rankSet2.push_back (0.5f);
     186  docSet2.push_back (15); rankSet2.push_back (0.6f);
     187  docSet2.push_back (16); rankSet2.push_back (0.7f);
     188  docSet2.push_back (17); rankSet2.push_back (0.8f);
     189  docSet2.push_back (19); rankSet2.push_back (0.9f);
     190  docSet2.push_back (20); rankSet2.push_back (0.1f);
     191  docSet2.push_back (21); rankSet2.push_back (0.2f);
    192192
    193193  cout << "\n" << setNode1->queryResult << "OR\n\n"
    … …  
    214214  DocNumArray &rcDocSet = resultCompare.docs;
    215215  RankArray &rcRankSet = resultCompare.ranks;
    216   rcDocSet.push_back (1);  rcRankSet.push_back (0.1);
    217   rcDocSet.push_back (2);  rcRankSet.push_back (0.1);
    218   rcDocSet.push_back (10); rcRankSet.push_back (0.2);
    219   rcDocSet.push_back (11); rcRankSet.push_back (0.2);
    220   rcDocSet.push_back (12); rcRankSet.push_back (0.3);
    221   rcDocSet.push_back (13); rcRankSet.push_back (0.4);
    222   rcDocSet.push_back (14); rcRankSet.push_back (0.5);
    223   rcDocSet.push_back (15); rcRankSet.push_back (0.2+0.6);
    224   rcDocSet.push_back (16); rcRankSet.push_back (0.7);
    225   rcDocSet.push_back (17); rcRankSet.push_back (0.8);
    226   rcDocSet.push_back (18); rcRankSet.push_back (0.4);
    227   rcDocSet.push_back (19); rcRankSet.push_back (0.9+0.5);
    228   rcDocSet.push_back (20); rcRankSet.push_back (0.1);
    229   rcDocSet.push_back (21); rcRankSet.push_back (0.2);
     216  rcDocSet.push_back (1);  rcRankSet.push_back (0.1f);
     217  rcDocSet.push_back (2);  rcRankSet.push_back (0.1f);
     218  rcDocSet.push_back (10); rcRankSet.push_back (0.2f);
     219  rcDocSet.push_back (11); rcRankSet.push_back (0.2f);
     220  rcDocSet.push_back (12); rcRankSet.push_back (0.3f);
     221  rcDocSet.push_back (13); rcRankSet.push_back (0.4f);
     222  rcDocSet.push_back (14); rcRankSet.push_back (0.5f);
     223  rcDocSet.push_back (15); rcRankSet.push_back (0.2f+0.6f);
     224  rcDocSet.push_back (16); rcRankSet.push_back (0.7f);
     225  rcDocSet.push_back (17); rcRankSet.push_back (0.8f);
     226  rcDocSet.push_back (18); rcRankSet.push_back (0.4f);
     227  rcDocSet.push_back (19); rcRankSet.push_back (0.9f+0.5f);
     228  rcDocSet.push_back (20); rcRankSet.push_back (0.1f);
     229  rcDocSet.push_back (21); rcRankSet.push_back (0.2f);
    230230 
    231231
    … …  
    317317  DocNumArray &docSet1 = setNode1->queryResult.docs;
    318318  RankArray &rankSet1 = setNode1->queryResult.ranks;
    319   docSet1.push_back (1);  rankSet1.push_back (0.1);
    320   docSet1.push_back (10); rankSet1.push_back (0.2);
    321   docSet1.push_back (15); rankSet1.push_back (0.2);
    322   docSet1.push_back (18); rankSet1.push_back (0.4);
    323   docSet1.push_back (19); rankSet1.push_back (0.5);
     319  docSet1.push_back (1);  rankSet1.push_back (0.1f);
     320  docSet1.push_back (10); rankSet1.push_back (0.2f);
     321  docSet1.push_back (15); rankSet1.push_back (0.2f);
     322  docSet1.push_back (18); rankSet1.push_back (0.4f);
     323  docSet1.push_back (19); rankSet1.push_back (0.5f);
    324324
    325325  SetQueryNode *setNode2 = new SetQueryNode;
    326326  DocNumArray &docSet2 = setNode2->queryResult.docs;
    327327  RankArray &rankSet2 = setNode2->queryResult.ranks;
    328   docSet2.push_back (2);  rankSet2.push_back (0.1);
    329   docSet2.push_back (11); rankSet2.push_back (0.2);
    330   docSet2.push_back (12); rankSet2.push_back (0.3);
    331   docSet2.push_back (13); rankSet2.push_back (0.4);
    332   docSet2.push_back (14); rankSet2.push_back (0.5);
    333   docSet2.push_back (15); rankSet2.push_back (0.6);
    334   docSet2.push_back (16); rankSet2.push_back (0.7);
    335   docSet2.push_back (17); rankSet2.push_back (0.8);
    336   docSet2.push_back (19); rankSet2.push_back (0.9);
    337   docSet2.push_back (20); rankSet2.push_back (0.1);
    338   docSet2.push_back (21); rankSet2.push_back (0.2);
     328  docSet2.push_back (2);  rankSet2.push_back (0.1f);
     329  docSet2.push_back (11); rankSet2.push_back (0.2f);
     330  docSet2.push_back (12); rankSet2.push_back (0.3f);
     331  docSet2.push_back (13); rankSet2.push_back (0.4f);
     332  docSet2.push_back (14); rankSet2.push_back (0.5f);
     333  docSet2.push_back (15); rankSet2.push_back (0.6f);
     334  docSet2.push_back (16); rankSet2.push_back (0.7f);
     335  docSet2.push_back (17); rankSet2.push_back (0.8f);
     336  docSet2.push_back (19); rankSet2.push_back (0.9f);
     337  docSet2.push_back (20); rankSet2.push_back (0.1f);
     338  docSet2.push_back (21); rankSet2.push_back (0.2f);
    339339
    340340  cout << "\n" << setNode1->queryResult << "NOT\n\n"
Note: See TracChangeset for help on using the changeset viewer.