Skip to content
Snippets Groups Projects
Commit bd81c267 authored by vcday's avatar vcday
Browse files

Merge branch 'master' of https://gitlab.eecs.umich.edu/vcday/eecs398-search into front-end

parents 18aa307d 81c040a7
No related branches found
No related tags found
1 merge request!19Front end
This commit is part of merge request !19. Comments created here will be created in the context of that merge request.
Showing
with 33 additions and 6 deletions
......@@ -241,8 +241,30 @@ add_executable(ISRMultiWordORTest
indexer/Corpus.cpp
indexer/Chunk.cpp
util/stringProcessing.cpp
util/Stemmer.cpp )
util/Stemmer.cpp
)
add_executable(NestedAnd
constraintSolver/tests/nestedAnd.cpp
util/util.cpp
constraintSolver/ISR.cpp
constraintSolver/ISRWord.cpp
constraintSolver/ISRContainer.cpp
constraintSolver/ISRAnd.cpp
constraintSolver/ISROr.cpp
constraintSolver/ISREndDoc.cpp
util/DataStructureLib/tuple.cpp
indexer/Corpus.cpp
indexer/Chunk.cpp
util/stringProcessing.cpp
util/Stemmer.cpp
query/queryLanguage/QueryParser.cpp
query/Ranker/Ranker.cpp
query/Ranker/Scorer.cpp
query/Ranker/Site.cpp
)
add_executable(DataStructures-Vector-tests
......@@ -369,6 +391,9 @@ add_executable(ISRAndTwitterIntegrityTest
indexer/Chunk.cpp
constraintSolver/tests/ISRAndTwitterIntegrityTest.cpp)
add_executable(devtool-SumSpaceNumbers
devtools/SumSpaceNumbers.cpp)
find_package(OpenSSL REQUIRED)
target_link_libraries(TryPopTest OpenSSL::SSL)
......
No preview for this file type
No preview for this file type
No preview for this file type
NestedAnd 0 → 100755
File added
......@@ -113,7 +113,7 @@ Location ISRAnd::Seek( Location target )
ISREndDoc *ISRAnd::GetEndDocument()
{
//What does currentLocation hold? When is it updated?
return furthestTerm->DocumentEnd;
return furthestTerm->GetEndDocument();
}
......
......@@ -9,6 +9,8 @@ ISRContainer::ISRContainer( Tuple * top ) : root( top )
{
compile( );
}
......@@ -53,10 +55,10 @@ string ISRContainer::Solve( )
while(Contained->GetCurrentLocation() != MAX_Location)
{
auto url = Contained->GetEndDocument()->getCurrentDoc().url;
//cout << url << endl;
cout << url << endl;
results += url + ",";
Location BeginningfDocument = Contained->GetISRToBeginningOfDocument( );
PassToRanker( BeginningfDocument );
//PassToRanker( BeginningfDocument );
//PassToRanker( BeginningfDocument );
Contained->NextDocument( );
......@@ -64,7 +66,7 @@ string ISRContainer::Solve( )
}
cout << "RANKER" << endl;
ranker.printRankedSites( );
//ranker.printRankedSites( );
return results;
......
......@@ -73,7 +73,7 @@ Location ISROr::Seek( Location target )
ISREndDoc *ISROr::GetEndDocument()
{
//What does currentLocation hold? When is it updated?
return nearestTerm->DocumentEnd;
return nearestTerm->GetEndDocument();
}
......
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
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