Skip to content
Snippets Groups Projects
Commit b6abf7aa authored by jsclose's avatar jsclose
Browse files

update to isr to begin of doc

parent 4df58716
No related branches found
No related tags found
1 merge request!8Origin/constraint solver
...@@ -244,7 +244,7 @@ add_executable(MasterReader-tests ...@@ -244,7 +244,7 @@ add_executable(MasterReader-tests
indexer/MasterReader.cpp indexer/MasterReader.cpp
) )
add_executable(query-Ranker-tests add_executable(queryRankerTest
query/Ranker/tests/RankerTest.cpp query/Ranker/tests/RankerTest.cpp
query/Ranker/Ranker.h query/Ranker/Ranker.h
query/Ranker/Scorer.h query/Ranker/Scorer.h
...@@ -256,7 +256,13 @@ add_executable(query-Ranker-tests ...@@ -256,7 +256,13 @@ add_executable(query-Ranker-tests
constraintSolver/ISRWord.cpp constraintSolver/ISRWord.cpp
constraintSolver/ISREndDoc.cpp constraintSolver/ISREndDoc.cpp
util/stringProcessing.cpp util/stringProcessing.cpp
util/Stemmer.cpp ) util/Stemmer.cpp
)
add_executable(testQueryLang
query/queryLanguage/tests/testQueryParser.cpp
query/queryLanguage/QueryParser.cpp
util/
)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
......
...@@ -42,6 +42,13 @@ public: ...@@ -42,6 +42,13 @@ public:
} }
Location GetISRToBeginningOfDocument( )
{
return GetEndDocument()->getCurrentDoc().docEndPosition - GetEndDocument()->getCurrentDoc().docNumWords;
}
//Returns first instance of word after target location //Returns first instance of word after target location
virtual Location Seek ( Location target ) = 0; virtual Location Seek ( Location target ) = 0;
......
...@@ -217,14 +217,7 @@ ISREndDoc * ISRWord::GetEndDocument() ...@@ -217,14 +217,7 @@ ISREndDoc * ISRWord::GetEndDocument()
return DocumentEnd; return DocumentEnd;
} }
ISR * ISRWord::GetISRToBeginningOfDocument ( ) {
Location beginningOfDoc = DocumentEnd->getCurrentDoc().docEndPosition - DocumentEnd->getCurrentDoc().docNumWords;
ISR* BeginngISR = new ISRWord(this->term);
BeginngISR->Seek(beginningOfDoc);
}
string ISRWord::GetTerm() string ISRWord::GetTerm()
{ {
......
...@@ -37,7 +37,6 @@ class ISRWord : public ISR ...@@ -37,7 +37,6 @@ class ISRWord : public ISR
unsigned GetNumberOfOccurrences ( ); unsigned GetNumberOfOccurrences ( );
string GetTerm( ); string GetTerm( );
ISR * GetISRToBeginningOfDocument ( ) ;
// ISR *GetDocumentISR( ); // ISR *GetDocumentISR( );
......
//
// Created by Jake Close on 3/13/18.
//
#include "Post.h"
//
// Created by Jake Close on 3/13/18.
//
#pragma once
typedef size_t Location; // Location 0 is the null location.
typedef size_t FileOffset;
typedef union Attributes
{
WordAttributes Word;
DocumentAttributes Document;
};
class Post
{
public:
//What Start / End Location
virtual Location GetStartLocation ( );
virtual Location GetEndLocation ( );
virtual Attributes GetAttributes ( );
//Returns Next next delta
//TO-DO NICK/ZANE
virtual Post *Next ( );
Location currentLocation;
//*why?
//virtual ISR* GetIsr( );
};
//
// Created by Jake Close on 3/13/18.
//
#include "PostingList.h"
//
// Created by Jake Close on 3/13/18.
//
#pragma once
#include "Post.h"
class PostingList
{
private:
struct PostingListIndex
{
FileOffset Offset;
Location PostLocation;
};
PostingListIndex *index;
virtual char *GetPostingList ( );
public:
virtual Post *Seek ( Location );
};
...@@ -34,8 +34,6 @@ int main ( ) ...@@ -34,8 +34,6 @@ int main ( )
while(queryOr->GetCurrentLocation() != MAX_Location) { while(queryOr->GetCurrentLocation() != MAX_Location) {
auto url = queryOr->GetEndDocument()->getCurrentDoc().url; auto url = queryOr->GetEndDocument()->getCurrentDoc().url;
if(url == "file59tweet151421970293063681")
cout << "PREBUG";
cout << url << endl; cout << url << endl;
urls.insert(url); urls.insert(url);
queryOr->NextDocument(); queryOr->NextDocument();
......
File added
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment