From 144ee16fc7d35a83f788b906998c0c5d9f11c43e Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Thu, 14 Nov 2019 20:37:34 +0100
Subject: [PATCH] fasttext now uses dict form.fasttext instead of letters
---
transition_machine/src/FeatureBank.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/transition_machine/src/FeatureBank.cpp b/transition_machine/src/FeatureBank.cpp
index 6c31cca..83fbfcb 100644
--- a/transition_machine/src/FeatureBank.cpp
+++ b/transition_machine/src/FeatureBank.cpp
@@ -631,7 +631,7 @@ FeatureModel::FeatureValue FeatureBank::fasttext(Config & c, const FeatureModel:
{
FeatureModel::FeatureValue result(FeatureModel::Function::Mean);
- Dict * lettersDict = Dict::getDict("letters");
+ Dict * lettersDict = Dict::getDict("form.f");
auto policy = dictPolicy2FeaturePolicy(lettersDict->policy);
if(word.values[0] == Dict::nullValueStr)
@@ -645,10 +645,10 @@ FeatureModel::FeatureValue FeatureBank::fasttext(Config & c, const FeatureModel:
if (wordLength < gramLength)
{
auto value = getLetters(c, word, 0, wordLength-1);
- result.dicts.emplace_back(value.dicts[0]);
+ result.dicts.emplace_back(lettersDict);
result.names.emplace_back(value.names[0]);
result.values.emplace_back(value.values[0]);
- result.policies.emplace_back(value.policies[0]);
+ result.policies.emplace_back(FeatureModel::Policy::Modifiable);
}
else
{
@@ -660,10 +660,10 @@ FeatureModel::FeatureValue FeatureBank::fasttext(Config & c, const FeatureModel:
int from = i * gramLength;
int to = i == nbGrams-1 ? wordLength-1 : (i+1)*gramLength-1;
auto value = getLetters(c, word, from, to);
- result.dicts.emplace_back(value.dicts[0]);
+ result.dicts.emplace_back(lettersDict);
result.names.emplace_back(value.names[0]);
result.values.emplace_back(value.values[0]);
- result.policies.emplace_back(value.policies[0]);
+ result.policies.emplace_back(FeatureModel::Policy::Modifiable);
}
}
else
@@ -671,10 +671,10 @@ FeatureModel::FeatureValue FeatureBank::fasttext(Config & c, const FeatureModel:
for (unsigned int i = 0; i+gramLength-1 < wordLength; i++)
{
auto value = getLetters(c, word, i, i+gramLength-1);
- result.dicts.emplace_back(value.dicts[0]);
+ result.dicts.emplace_back(lettersDict);
result.names.emplace_back(value.names[0]);
result.values.emplace_back(value.values[0]);
- result.policies.emplace_back(value.policies[0]);
+ result.policies.emplace_back(FeatureModel::Policy::Modifiable);
}
}
}
--
GitLab