Fixed accuracy computing when using iterationSize argument

trainer/include/TrainInfos.hpp

@@ -18,6 +18,7 @@ class TrainInfos
   std::string filename;
   int lastEpoch;
   int lastSaved;
+  int lastIndexTreated;
   std::map< std::string, std::vector<float> > trainLossesPerClassifierPerEpoch;
   std::map< std::string, std::vector<float> > devLossesPerClassifierPerEpoch;
   std::map< std::string, std::vector<float> > trainScoresPerClassifierPerEpoch;
@@ -55,6 +56,7 @@ class TrainInfos
   void nextEpoch();
   bool mustSave(const std::string & classifier);
   void printScores(FILE * output);
+  void setLastIndexTreated(int index);
 };
 
 #endif

trainer/src/TrainInfos.cpp

@@ -148,7 +148,7 @@ float TrainInfos::computeScoreOnTapes(Config & c, std::vector<std::string> tapes
   float res = 0.0;
 
   for (auto & tape : tapes)
-    res += c.getTape(tape).getScore();
+    res += c.getTape(tape).getScore(0, lastIndexTreated);
 
   return res / tapes.size();
 }
@@ -292,3 +292,8 @@ bool TrainInfos::mustSave(const std::string & classifier)
   return mustSavePerClassifierPerEpoch.count(classifier) && mustSavePerClassifierPerEpoch[classifier].back();
 }
 
+void TrainInfos::setLastIndexTreated(int index)
+{
+  lastIndexTreated = index;
+}
+

trainer/src/Trainer.cpp

@@ -192,6 +192,7 @@ void Trainer::resetAndShuffle()
 {
   tm.reset();
   trainConfig.reset();
+  TI.setLastIndexTreated(0);
 
   if(ProgramParameters::shuffleExamples)
     trainConfig.shuffle(ProgramParameters::sequenceDelimiterTape, ProgramParameters::sequenceDelimiter);
@@ -540,6 +541,8 @@ void Trainer::train()
       if (ProgramParameters::iterationSize != -1 && nbSteps >= ProgramParameters::iterationSize)
         try {prepareNextEpoch();}
         catch (EndOfTraining &) {break;}
+
+      TI.setLastIndexTreated(trainConfig.getHead());
     }
 
     if (ProgramParameters::debug)

transition_machine/include/Config.hpp

@@ -132,8 +132,11 @@ class Config
     void maskIndex(int index);
     /// @brief Compare hyp and ref to give a matching score.
     ///
+    /// @param from first index to evaluate
+    /// @param to last index to evaluate
+    ///
     /// @return The score as a percentage.
-    float getScore();
+    float getScore(int from, int to);
   };
 
   private :

transition_machine/src/Config.cpp

@@ -647,14 +647,14 @@ std::vector< std::pair<std::string, int> > & Config::getActionsHistory(std::stri
   return actionsHistory[state+"_"+std::to_string(head)];
 }
 
-float Config::Tape::getScore()
+float Config::Tape::getScore(int from, int to)
 {
   float res = 0.0;
 
-  for (int i = 0; i < refSize()-1; i++)
+  for (int i = from; i <= to; i++)
     if (getRef(i-head) == getHyp(i-head))
       res += 1;
 
-  return 100.0*res / (refSize()-1);
+  return 100.0*res / (1+to-from);
 }