diff --git a/dist/Index/InvertedIndex.d.ts b/dist/Index/InvertedIndex.d.ts index 0a250db..e2413f7 100644 --- a/dist/Index/InvertedIndex.d.ts +++ b/dist/Index/InvertedIndex.d.ts @@ -8,11 +8,11 @@ export declare class InvertedIndex { private index; constructor(dictionaryOrFileName?: any, terms?: Array, comparator?: WordComparator); readPostingList(fileName: string): void; - keyComparator: (a: (string | number)[], b: (string | number)[]) => 1 | -1 | 0; + keyComparator: (a: (string | number)[], b: (string | number)[]) => 0 | 1 | -1; saveSorted(fileName: string): void; save(fileName: string): void; add(termId: number, docId: number): void; - postingListComparator: (listA: PostingList, listB: PostingList) => 1 | -1 | 0; + postingListComparator: (listA: PostingList, listB: PostingList) => 0 | 1 | -1; autoCompleteWord(wordList: Array, dictionary: TermDictionary): void; search(query: Query, dictionary: TermDictionary): QueryResult; } diff --git a/dist/Index/PositionalIndex.d.ts b/dist/Index/PositionalIndex.d.ts index 3d8df82..7795440 100644 --- a/dist/Index/PositionalIndex.d.ts +++ b/dist/Index/PositionalIndex.d.ts @@ -10,7 +10,7 @@ export declare class PositionalIndex { private positionalIndex; constructor(dictionaryOrFileName?: any, terms?: Array, comparator?: WordComparator); readPositionalPostingList(fileName: string): void; - keyComparator: (a: (string | number)[], b: (string | number)[]) => 1 | -1 | 0; + keyComparator: (a: (string | number)[], b: (string | number)[]) => 0 | 1 | -1; saveSorted(fileName: string): void; save(fileName: string): void; addPosition(termId: number, docId: number, position: number): void; diff --git a/dist/Index/PositionalIndex.js b/dist/Index/PositionalIndex.js index f7a3d25..f6e5127 100644 --- a/dist/Index/PositionalIndex.js +++ b/dist/Index/PositionalIndex.js @@ -207,7 +207,7 @@ } } for (let docID of scores.keys()) { - result.add(docID, scores.get(docID) / documents[docID].getSize()); + result.add(docID, Math.sqrt(scores.get(docID)) / (documents[docID].getSize() * query.size())); } result.getBest(documentsReturned); return result; diff --git a/dist/Index/PositionalIndex.js.map b/dist/Index/PositionalIndex.js.map index 73d6030..79a0a8d 100644 --- a/dist/Index/PositionalIndex.js.map +++ b/dist/Index/PositionalIndex.js.map @@ -1 +1 @@ -{"version":3,"file":"PositionalIndex.js","sourceRoot":"","sources":["../../source/Index/PositionalIndex.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"PositionalIndex.js","sourceRoot":"","sources":["../../source/Index/PositionalIndex.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/Query/QueryResult.js b/dist/Query/QueryResult.js index 9d8c5b4..75f55c0 100644 --- a/dist/Query/QueryResult.js +++ b/dist/Query/QueryResult.js @@ -52,7 +52,7 @@ for (let searchedItem of this.items) { let low = 0; let high = queryResult.size() - 1; - let middle = (low + high) / 2; + let middle = Math.floor((low + high) / 2); let found = false; while (low <= high) { if (searchedItem.getDocId() > queryResult.items[middle].getDocId()) { @@ -67,7 +67,7 @@ break; } } - middle = (low + high) / 2; + middle = Math.floor((low + high) / 2); } if (found) { result.add(searchedItem.getDocId(), searchedItem.getScore()); diff --git a/dist/Query/QueryResult.js.map b/dist/Query/QueryResult.js.map index 6afdbd3..a7cbb97 100644 --- a/dist/Query/QueryResult.js.map +++ b/dist/Query/QueryResult.js.map @@ -1 +1 @@ -{"version":3,"file":"QueryResult.js","sourceRoot":"","sources":["../../source/Query/QueryResult.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"QueryResult.js","sourceRoot":"","sources":["../../source/Query/QueryResult.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/source/Index/PositionalIndex.ts b/source/Index/PositionalIndex.ts index 9114a5a..0dbc706 100644 --- a/source/Index/PositionalIndex.ts +++ b/source/Index/PositionalIndex.ts @@ -213,7 +213,7 @@ export class PositionalIndex { } } for (let docID of scores.keys()){ - result.add(docID, scores.get(docID) / documents[docID].getSize()) + result.add(docID, Math.sqrt(scores.get(docID)) / (documents[docID].getSize()*query.size())) } result.getBest(documentsReturned) return result diff --git a/source/Query/QueryResult.ts b/source/Query/QueryResult.ts index 44ffd72..464e364 100644 --- a/source/Query/QueryResult.ts +++ b/source/Query/QueryResult.ts @@ -46,7 +46,7 @@ export class QueryResult { for (let searchedItem of this.items){ let low = 0 let high = queryResult.size() - 1 - let middle = (low + high) / 2 + let middle = Math.floor((low + high) / 2) let found = false while (low <= high){ if (searchedItem.getDocId() > queryResult.items[middle].getDocId()){ @@ -59,7 +59,7 @@ export class QueryResult { break } } - middle = (low + high) / 2 + middle = Math.floor((low + high) / 2) } if (found){ result.add(searchedItem.getDocId(), searchedItem.getScore())