Fixed action hash

maca_common/include/LimitedStack.hpp

@@ -13,11 +13,12 @@
 namespace std
 {
   template<>
-  struct hash< std::pair<std::string, Action> >
+  struct hash< pair<string, Action> >
   {
-    size_t operator()(const std::pair<std::string, Action> &p) const
+    size_t operator()(const pair<std::string, Action> & p) const
     {
-      return 0;
+      static hash<string> h;
+      return h(p.first + p.second.name);
     }
   };
 }
@@ -43,6 +44,7 @@ class LimitedStack
   {
     nbElements = 0;
     lastElementIndex = -1; 
+    present.clear();
   }
 
   void push(T elem)

trainer/src/Trainer.cpp

@@ -381,7 +381,6 @@ void Trainer::doStepTrain()
     }
     std::string normalClassifierName(buffer);
 
-    auto & errorHistory = trainConfig.getActionsHistory(tm.getCurrentClassifier()->name);
     auto & normalHistory = trainConfig.getActionsHistory(normalClassifierName);
 
     // If a BACK just happened

transition_machine/include/Config.hpp

@@ -134,7 +134,7 @@ class Config
 
   private :
 
-  const unsigned int HISTORY_SIZE = 100000000;
+  const unsigned int HISTORY_SIZE = 100000;
   /// @brief The name of the current state of the TransitionMachine.
   std::string currentStateName;
   /// @brief For each state of the TransitionMachine, an history of the Action that have been applied to this Config.

transition_machine/src/Config.cpp

@@ -437,7 +437,7 @@ void Config::addToEntropyHistory(float entropy)
 
 std::size_t Config::computeHash()
 {
-  static int window = 3;
+  static int window = 10;
 
   int start = std::max(0, head-window);
   int end = std::min(tapes[0].refSize()-1, head+window);