From 90e4eca0a340d05b31b45c32255a0842d1bf7492 Mon Sep 17 00:00:00 2001 From: Hieu Hoang Date: Mon, 13 Oct 2014 12:46:58 +0100 Subject: cleaning up IOWrapper. Make all functions member of the class --- moses-cmd/LatticeMBRGrid.cpp | 4 ++-- moses-cmd/Main.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'moses-cmd') diff --git a/moses-cmd/LatticeMBRGrid.cpp b/moses-cmd/LatticeMBRGrid.cpp index bbf5f2a8b..f00f40fd0 100644 --- a/moses-cmd/LatticeMBRGrid.cpp +++ b/moses-cmd/LatticeMBRGrid.cpp @@ -177,7 +177,7 @@ int main(int argc, char* argv[]) const vector& prune_grid = grid.getGrid(lmbr_prune); const vector& scale_grid = grid.getGrid(lmbr_scale); - while(ioWrapper->ReadInput(*ioWrapper,staticData.GetInputType(),source)) { + while(ioWrapper->ReadInput(staticData.GetInputType(),source)) { ++lineCount; source->SetTranslationId(lineCount); @@ -200,7 +200,7 @@ int main(int argc, char* argv[]) staticData.SetMBRScale(scale); cout << lineCount << " ||| " << p << " " << r << " " << prune << " " << scale << " ||| "; vector mbrBestHypo = doLatticeMBR(manager,nBestList); - OutputBestHypo(mbrBestHypo, lineCount, staticData.GetReportSegmentation(), + ioWrapper->OutputBestHypo(mbrBestHypo, lineCount, staticData.GetReportSegmentation(), staticData.GetReportAllFactors(),cout); } } diff --git a/moses-cmd/Main.cpp b/moses-cmd/Main.cpp index 5758103f3..7e8a4a0e3 100644 --- a/moses-cmd/Main.cpp +++ b/moses-cmd/Main.cpp @@ -148,7 +148,7 @@ int main(int argc, char** argv) // main loop over set of input sentences InputType* source = NULL; size_t lineCount = staticData.GetStartTranslationId(); - while(ioWrapper->ReadInput(*ioWrapper,staticData.GetInputType(),source)) { + while(ioWrapper->ReadInput(staticData.GetInputType(),source)) { source->SetTranslationId(lineCount); IFVERBOSE(1) { ResetUserTime(); -- cgit v1.2.3