diff --git a/wcclrun/main.cpp b/wcclrun/main.cpp index 61c738b9523ae120cca9d59d5438f86bc2510016..06d2b6c218f5b6a9fff27e44b76776a3e4faf778 100644 --- a/wcclrun/main.cpp +++ b/wcclrun/main.cpp @@ -47,7 +47,6 @@ public: return ops_; } - void do_head(); void do_sentence(const boost::shared_ptr<Corpus2::Sentence>& sentence); void do_stream(std::istream& is, bool first); @@ -95,23 +94,6 @@ bool Runner::load_more_operators(const std::string& filename) return false; } -void Runner::do_head() -{ - streamsave sv(std::cout); - std::cout << "## "; - std::cout << std::setw(20) << "orth"; - int i = 0; - foreach (const boost::shared_ptr<Wccl::FunctionalOperator>& o, ops_) { - ++i; - std::cout << " "; - std::cout.setf(std::ios::right); - std::cout << std::setw(15) << "operator "; - std::cout.setf(std::ios::left); - std::cout << std::setw(5) << i; - } - std::cout << "\n"; -} - void Runner::do_sentence(const boost::shared_ptr<Corpus2::Sentence>& sentence) { Wccl::SentenceContext sc(sentence); @@ -171,7 +153,6 @@ void Runner::do_stream(std::istream& is, bool first) { Corpus2::XcesReader xr(tagset_, is); Corpus2::Sentence::Ptr s; - //do_head(tagset, ops); while ((s = xr.get_next_sentence())) { do_sentence(s); std::cout << "\n"; @@ -209,6 +190,8 @@ int main(int argc, char** argv) "Output in-sentence token counts\n") ("global-counts,g", value(&global_numbering), "Output global counts\n") + ("output-orths,O", value(&output_orths), + "Output token orths\n") ("help,h", "Show help") ; boost::program_options::variables_map vm;