From 9812754a95dcda285da78376b7bb1d7e714b279e Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Wed, 15 May 2019 11:01:24 +0200
Subject: [PATCH] Added Oracle none
---
trainer/src/Trainer.cpp | 1 -
transition_machine/src/Oracle.cpp | 16 +++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/trainer/src/Trainer.cpp b/trainer/src/Trainer.cpp
index ac5f7e9..b035da2 100644
--- a/trainer/src/Trainer.cpp
+++ b/trainer/src/Trainer.cpp
@@ -381,7 +381,6 @@ void Trainer::doStepTrain()
}
std::string normalClassifierName(buffer);
- //ici
auto & errorHistory = trainConfig.getActionsHistory(tm.getCurrentClassifier()->name);
auto & normalHistory = trainConfig.getActionsHistory(normalClassifierName);
diff --git a/transition_machine/src/Oracle.cpp b/transition_machine/src/Oracle.cpp
index bc54f85..f7b84c3 100644
--- a/transition_machine/src/Oracle.cpp
+++ b/transition_machine/src/Oracle.cpp
@@ -97,7 +97,6 @@ void Oracle::createDatabase()
str2oracle.emplace("error_tagger", std::unique_ptr<Oracle>(new Oracle(
[](Oracle * oracle)
{
- return;
File file(oracle->filename, "r");
FILE * fd = file.getDescriptor();
char b1[1024];
@@ -156,7 +155,6 @@ void Oracle::createDatabase()
str2oracle.emplace("error_morpho", std::unique_ptr<Oracle>(new Oracle(
[](Oracle * oracle)
{
- return;
File file(oracle->filename, "r");
FILE * fd = file.getDescriptor();
char b1[1024];
@@ -222,7 +220,6 @@ void Oracle::createDatabase()
str2oracle.emplace("error_parser", std::unique_ptr<Oracle>(new Oracle(
[](Oracle * oracle)
{
- return;
File file(oracle->filename, "r");
FILE * fd = file.getDescriptor();
char b1[1024];
@@ -375,6 +372,19 @@ void Oracle::createDatabase()
return 0;
})));
+ str2oracle.emplace("none", std::unique_ptr<Oracle>(new Oracle(
+ [](Oracle *)
+ {
+ },
+ [](Config &, Oracle *)
+ {
+ return "NOTHING";
+ },
+ [](Config &, Oracle *, const std::string &)
+ {
+ return 0;
+ })));
+
str2oracle.emplace("lemma_lookup", std::unique_ptr<Oracle>(new Oracle(
[](Oracle * oracle)
{
--
GitLab