update to isr to begin of doc

CMakeLists.txt

@@ -244,7 +244,7 @@ add_executable(MasterReader-tests
         indexer/MasterReader.cpp
         )
 
-add_executable(query-Ranker-tests
+add_executable(queryRankerTest
         query/Ranker/tests/RankerTest.cpp
         query/Ranker/Ranker.h
         query/Ranker/Scorer.h
@@ -256,7 +256,13 @@ add_executable(query-Ranker-tests
         constraintSolver/ISRWord.cpp
         constraintSolver/ISREndDoc.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)
 

constraintSolver/ISR.h

@@ -42,6 +42,13 @@ public:
 
 		}
 
+
+	Location GetISRToBeginningOfDocument( )
+		{
+		return GetEndDocument()->getCurrentDoc().docEndPosition - GetEndDocument()->getCurrentDoc().docNumWords;
+
+		}
+
 	//Returns first instance of word after target location
 	virtual Location Seek ( Location target ) = 0;
 

constraintSolver/ISRWord.cpp

@@ -217,14 +217,7 @@ ISREndDoc * ISRWord::GetEndDocument()
 	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()
 	{

constraintSolver/ISRWord.h

@@ -37,7 +37,6 @@ class ISRWord : public ISR
 		unsigned GetNumberOfOccurrences ( );
 
 		string GetTerm( );
-		ISR * GetISRToBeginningOfDocument ( ) ;
 
 
 	// ISR *GetDocumentISR( );

constraintSolver/Post.cpp

-//
-// Created by Jake Close on 3/13/18.
-//
-
-#include "Post.h"

constraintSolver/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( );
-
-	};
-
-

constraintSolver/PostingList.cpp

-//
-// Created by Jake Close on 3/13/18.
-//
-
-#include "PostingList.h"

constraintSolver/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 );
-
-
-	};
-
-

constraintSolver/tests/ISROrTests.cpp

@@ -34,8 +34,6 @@ int main ( )
 	while(queryOr->GetCurrentLocation() != MAX_Location) {
 
 		auto url = queryOr->GetEndDocument()->getCurrentDoc().url;
-		if(url == "file59tweet151421970293063681")
-			cout << "PREBUG";
 		cout << url << endl;
 		urls.insert(url);
 		queryOr->NextDocument();