Fixed remaining bugs

decoder/src/Decoder.cpp

@@ -2,8 +2,11 @@
 #include "util.hpp"
 #include "Error.hpp"
 #include "ActionBank.hpp"
+#include "ProgramOutput.hpp"
 #include <chrono>
 
+//TODO : Faire se rejoindre les beam en debut de phrase, et faire la moyenne de totalentropy sur le nb d'actions de la phrase.
+
 Decoder::Decoder(TransitionMachine & tm, Config & config)
 : tm(tm), config(config)
 {
@@ -183,12 +186,14 @@ struct BeamNode
   {
     totalEntropy = 0.0;
     config.setOutputFile(nullptr);
+    config.totalEntropy = totalEntropy;
   }
   BeamNode(BeamNode & other, Action * action, float proba) : tm(other.tm), config(other.config)
   {
     totalEntropy = other.totalEntropy + proba;
     this->action = action;
     config.setOutputFile(nullptr);
+    config.totalEntropy = totalEntropy;
   }
 };
 
@@ -200,6 +205,8 @@ void Decoder::decode()
     decodeBeam();
   else
     decodeNoBeam();
+
+  ProgramOutput::instance.print(stdout);
 }
 
 void Decoder::decodeNoBeam()
@@ -252,6 +259,7 @@ void Decoder::decodeNoBeam()
 
   config.printTheRest();
 
+  if (ProgramParameters::interactive)
     fprintf(stderr, "                                                     \n");
 }
 
@@ -354,6 +362,7 @@ void Decoder::decodeBeam()
 
   beam[0]->config.printTheRest();
 
+  if (ProgramParameters::interactive)
     fprintf(stderr, "                                                     \n");
 }
 

maca_common/src/ProgramOutput.cpp

@@ -13,9 +13,14 @@ void ProgramOutput::addLine(const std::string & line, float entropy, unsigned in
 {
   lines.emplace_back(line);
   entropies.emplace_back(entropy);
-  while (index > outputIndexes.size()-1)
+  while ((int)index > ((int)outputIndexes.size())-1)
     outputIndexes.emplace_back(-1);
+
   if (outputIndexes[index] == -1 || entropies[outputIndexes[index]] < entropy)
+  {
+    if (outputIndexes[index] != -1)
+      fprintf(stderr, "REMPLACED ! <%u>\n", index);
     outputIndexes[index] = lines.size()-1;
   }
+}
 

transition_machine/include/Config.hpp

@@ -156,6 +156,8 @@ class Config
   LimitedStack<std::size_t> hashHistory;
   /// @brief The sequence of Actions that made that Config.
   LimitedStack< std::pair<std::string, Action> > pastActions;
+  /// @brief Measure of how much the model is confident in the predictons made in this Config.
+  float totalEntropy;
 
   public :
 

transition_machine/src/Config.cpp

@@ -3,6 +3,7 @@
 #include "File.hpp"
 #include "ProgramParameters.hpp"
 #include "Action.hpp"
+#include "ProgramOutput.hpp"
 
 Config::Config(BD & bd, const std::string inputFilename) : bd(bd), hashHistory(10), pastActions(100)
 {
@@ -15,6 +16,7 @@ Config::Config(BD & bd, const std::string inputFilename) : bd(bd), hashHistory(1
   inputAllRead = false;
   for(int i = 0; i < bd.getNbLines(); i++)
     tapes.emplace_back(bd.getNameOfLine(i), bd.lineIsKnown(i));
+  this->totalEntropy = 0;
 }
 
 Config::Config(const Config & other) : bd(other.bd), hashHistory(other.hashHistory), pastActions(other.pastActions)
@@ -28,6 +30,7 @@ Config::Config(const Config & other) : bd(other.bd), hashHistory(other.hashHisto
   this->outputFile = other.outputFile;
   this->lastIndexPrinted = other.lastIndexPrinted;
   this->tapes = other.tapes;
+  this->totalEntropy = other.totalEntropy;
 
   this->inputFilename = other.inputFilename;
   this->inputAllRead = other.inputAllRead;
@@ -216,7 +219,7 @@ void Config::printAsOutput(FILE * output, int dataIndex, int realIndex)
     }
   }
 
-  fprintf(stderr, "Print %d\n", realIndex);
+  ProgramOutput::instance.addLine(toPrint, totalEntropy, realIndex);
 }
 
 void Config::moveHead(int mvt)
@@ -565,19 +568,15 @@ void Config::printTheRest()
   int tapeSize = tapes[0].size();
 
   int goalPrintIndex = lastIndexPrinted;
-  int realIndex = tapeSize - ((()-())+());
+  int realIndex = tapeSize - 1 - ((((tapes[0].dataSize()-(goalPrintIndex == -1 ? 0 : 0)))-(goalPrintIndex+1))+(goalPrintIndex));
   for (int i = goalPrintIndex+1; i < (tapes[0].dataSize()-(goalPrintIndex == -1 ? 1 : 0)); i++)
   {
-    printAsOutput(outputFile, i, 0);
-    fprintf(stderr, "i=%d tapeSize=%d dataSize=%d\n", i, tapeSize, tapes[0].dataSize());
-    fprintf(stderr, "calcul = %d\n", realIndex);
+    printAsOutput(outputFile, i, realIndex);
     realIndex++;
   }
   for (int i = 0; i < goalPrintIndex; i++)
   {
-    printAsOutput(outputFile, i, 0);
-    fprintf(stderr, "i=%d tapeSize=%d dataSize=%d\n", i, tapeSize, tapes[0].dataSize());
-    fprintf(stderr, "calcul = %d\n", realIndex);
+    printAsOutput(outputFile, i, realIndex);
     realIndex++;
   }
 }