From 66d1e477bbee4f8d6b7d0a9a26e144f37e1c723c Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Sat, 20 Feb 2021 21:07:26 +0100
Subject: [PATCH] Removing TSV lines from Config constructor when in txt mode
---
decoder/src/MacaonDecode.cpp | 6 +++---
trainer/src/MacaonTrain.cpp | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/decoder/src/MacaonDecode.cpp b/decoder/src/MacaonDecode.cpp
index 2e4ed9f..eea032a 100644
--- a/decoder/src/MacaonDecode.cpp
+++ b/decoder/src/MacaonDecode.cpp
@@ -100,7 +100,7 @@ int MacaonDecode::main()
if (!inputTXT.empty())
rawInputs = util::readFileAsUtf8(inputTXT, lineByLine);
- std::vector<std::vector<std::string>> tsv;
+ std::vector<std::vector<std::string>> tsv, noTsv;
if (!inputTSV.empty())
tsv = util::readTSV(inputTSV);
@@ -109,7 +109,7 @@ int MacaonDecode::main()
{
if (rawInputs.size())
for (unsigned int i = 0; i < rawInputs.size(); i++)
- configs.emplace_back(mcd, tsv, rawInputs[i], std::vector<int>{(int)i});
+ configs.emplace_back(mcd, noTsv, rawInputs[i], std::vector<int>{(int)i});
else
for (unsigned int i = 0; i < tsv.size(); i++)
configs.emplace_back(mcd, tsv, util::utf8string(), std::vector<int>{(int)i});
@@ -117,7 +117,7 @@ int MacaonDecode::main()
else
{
if (rawInputs.size())
- configs.emplace_back(mcd, tsv, rawInputs[0], std::vector<int>());
+ configs.emplace_back(mcd, noTsv, rawInputs[0], std::vector<int>());
else
configs.emplace_back(mcd, tsv, util::utf8string(), std::vector<int>());
}
diff --git a/trainer/src/MacaonTrain.cpp b/trainer/src/MacaonTrain.cpp
index 02d58fd..cada3bc 100644
--- a/trainer/src/MacaonTrain.cpp
+++ b/trainer/src/MacaonTrain.cpp
@@ -165,7 +165,7 @@ int MacaonTrain::main()
try
{
- std::vector<std::vector<std::string>> trainTsv, devTsv;
+ std::vector<std::vector<std::string>> trainTsv, devTsv, noTsv;
if (!trainTsvFile.empty())
trainTsv = util::readTSV(trainTsvFile);
if (!devTsvFile.empty())
@@ -304,7 +304,7 @@ int MacaonTrain::main()
{
if (devRawInputs.size())
for (unsigned int i = 0; i < devRawInputs.size(); i++)
- devConfigs.emplace_back(mcd, devTsv, devRawInputs[i], std::vector<int>{(int)i});
+ devConfigs.emplace_back(mcd, noTsv, devRawInputs[i], std::vector<int>{(int)i});
else
for (unsigned int i = 0; i < devTsv.size(); i++)
devConfigs.emplace_back(mcd, devTsv, util::utf8string(), std::vector<int>{(int)i});
@@ -312,7 +312,7 @@ int MacaonTrain::main()
else
{
if (devRawInputs.size())
- devConfigs.emplace_back(mcd, devTsv, devRawInputs[0], std::vector<int>());
+ devConfigs.emplace_back(mcd, noTsv, devRawInputs[0], std::vector<int>());
else
devConfigs.emplace_back(mcd, devTsv, util::utf8string(), std::vector<int>());
}
--
GitLab