Skip to content
Snippets Groups Projects
Commit 1d8edb21 authored by ilor's avatar ilor
Browse files

follow the switch to use shared_ptrs for sentence and chunk objects in corpus2

parent 075930df
Branches
No related merge requests found
......@@ -10,7 +10,7 @@ SentenceContext::SentenceContext(const boost::shared_ptr<Corpus2::Sentence>& s)
SentenceContext SentenceContext::duplicate() const
{
SentenceContext dup(*this);
dup.sentence_.reset(sentence_->clone());
dup.sentence_ = sentence_->clone_shared();
return dup;
}
......
......@@ -66,7 +66,7 @@ void test_one_item_actual(const compare_test& c)
if (!sentence_filename.empty()) {
path sentence_fullpath = c.search_path / sentence_filename;
Corpus2::XcesReader reader(tagset, sentence_fullpath.string());
sentence.reset(reader.get_next_sentence());
sentence = reader.get_next_sentence();
BOOST_REQUIRE(sentence);
}
else {
......
......@@ -8,6 +8,7 @@
#include <libcorpus2/tagsetmanager.h>
#include <boost/bind.hpp>
#include <boost/make_shared.hpp>
#include <boost/program_options.hpp>
#include <libcorpus2/io/xcesreader.h>
......@@ -209,13 +210,13 @@ int main(int argc, char** argv)
const Corpus2::Tagset& tagset = Corpus2::get_named_tagset(tagset_load);
boost::shared_ptr<Corpus2::Sentence> sentence;
if (sentence_load.empty()) {
sentence.reset(new Corpus2::Sentence);
sentence = boost::make_shared<Corpus2::Sentence>();
sentence->append(new Corpus2::Token("", PwrNlp::Whitespace::ManySpaces));
} else {
std::ifstream ifs(sentence_load.c_str());
if (ifs.good()) {
Corpus2::XcesReader reader(tagset, ifs, false);
sentence.reset(reader.get_next_sentence());
sentence = reader.get_next_sentence();
std::cerr << "Sentence loaded, " << sentence->size()
<< " tokens.\n";
} else {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment