Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect paragraph ordering #14

Merged
merged 1 commit into from
Jan 21, 2020
+13 −3
Merged

Fix incorrect paragraph ordering #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions CALEngine/src/dataset.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include <thread>
#include <algorithm>
#include "dataset.h"
#include "utils/utils.h"

Expand All @@ -14,12 +15,14 @@ unordered_map<string, size_t> generate_inverted_index(const SparseVectors &spars
return inverted_index;
}

string get_doc_id(const string &para_id){
return para_id.substr(0, para_id.find("."));
}

vector<int> generate_parent_documents(const Dataset &parent_dataset, const SparseVectors &sparse_vectors){
vector<int> parent_documents(sparse_vectors->size());
for(int i = 0; i < parent_documents.size(); i++){
auto &para_id = sparse_vectors->at(i)->doc_id;
string doc_id = para_id.substr(0, para_id.find("."));
parent_documents[i] = parent_dataset.get_index(doc_id);
parent_documents[i] = parent_dataset.get_index(get_doc_id(sparse_vectors->at(i)->doc_id));

if(i > 0 && parent_documents[i] < parent_documents[i-1]){
fail("Paragraphs must be in increasing order of their parent document ids", -1);
Expand Down Expand Up @@ -202,5 +205,12 @@ ParagraphDataset::ParagraphDataset(const Dataset &_parent_dataset,
std::unordered_map<std::string, TermInfo> _dictionary):
Dataset(move(sparse_vectors), _dictionary),
parent_dataset(_parent_dataset){
sort(
doc_features->begin(),
doc_features->end(),
[&](const unique_ptr<SfSparseVector> &a, const unique_ptr<SfSparseVector> &b) -> bool {
return parent_dataset.get_index(get_doc_id(a->doc_id)) < parent_dataset.get_index(get_doc_id(b->doc_id));
}
);
parent_documents = generate_parent_documents(_parent_dataset, doc_features);
}