diff --git a/libmwereader/mweparser.cpp b/libmwereader/mweparser.cpp index 02ea04bb1bf55a6ecb41ca33b881e71f7e6ba402..5487097e58519151ee7be81c14d7a9b2cf868a09 100644 --- a/libmwereader/mweparser.cpp +++ b/libmwereader/mweparser.cpp @@ -92,7 +92,7 @@ namespace Corpus2 { const std::string &name) const { std::string value; - BOOST_FOREACH (const Attribute& a, attributes) { + BOOST_FOREACH (const Attribute& a, attributes) { if (a.name == name) { value = a.value; } diff --git a/libmwereader/mwereader.cpp b/libmwereader/mwereader.cpp index 1af82271bf3ba403464cf85d7f44cb5f71f85ba0..cb0106eccbb486346486a50d65b30dde53804008 100644 --- a/libmwereader/mwereader.cpp +++ b/libmwereader/mwereader.cpp @@ -32,12 +32,12 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>( mwes_counter=0; } - MWEReader::MWEReader(const Tagset &tagset, const std::string &filename, TokenReaderPtr reader) - : TokenReader(tagset), inner_filename_(filename) - { - mwes_counter=0; - inner_reader_ = reader; - } + MWEReader::MWEReader(const Tagset &tagset, const std::string &filename, TokenReaderPtr reader) + : TokenReader(tagset), inner_filename_(filename) + { + mwes_counter=0; + inner_reader_ = reader; + } MWEReader::~MWEReader() { @@ -97,7 +97,7 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>( int head; bool is_here = pLU->IsHere(sc, positions, head); if(is_here) - return process_sentence(clone_sentence_add_mwe(sentence, head, positions, pLU->get_base())); + return process_sentence(clone_sentence_add_mwe(sentence, head, positions, pLU->get_base())); } } } @@ -105,7 +105,7 @@ bool MWEReader::registered = TokenReader::register_path_reader<MWEReader>( return sentence; } - Sentence::Ptr MWEReader::clone_sentence_add_mwe(Corpus2::Sentence::Ptr sentence, + Sentence::Ptr MWEReader::clone_sentence_add_mwe(Corpus2::Sentence::Ptr sentence, int head, const std::set<int>& all, const std::string &new_base) { diff --git a/libmwereader/test_mwe.xml b/libmwereader/test_mwe.xml index 85368ac2ab5f4466a51c4d1a5f1879112fa39287..635b1f1442dd05b191e472d0bae6f50ff8fb9613 100644 --- a/libmwereader/test_mwe.xml +++ b/libmwereader/test_mwe.xml @@ -44,7 +44,7 @@ ) </condition> <instances> - <MWE name="dobre imiÄ™"> + <MWE base="dobre imiÄ™"> <var name="Adj">dobry</var> <var name="Subst">imiÄ™</var> <head>inter(class[0],{subst,ger,depr})</head> diff --git a/libwccl/wcclfile.h b/libwccl/wcclfile.h index a9156fa419527cbecf07c8a8b6505d65bc9c8a30..a54b03457b7e91ba75a215f140d0ec5791a3b711 100644 --- a/libwccl/wcclfile.h +++ b/libwccl/wcclfile.h @@ -366,7 +366,7 @@ WcclFile::WcclFile(const Corpus2::Tagset& tagset, const std::string& search_path path_(":") { path_.set_search_path(search_path); - path_.set_verbose(true); + path_.set_verbose(false); } inline