Wow, caching works?

EntropyInterpolationStrategy.cpp

@@ -28,8 +28,12 @@ double EntropyInterpolationStrategy::get(const Pattern& context)
 {
 	int contextSize = context.size();
 
-	std::map<Pattern, double>::const_iterator i = weights.find(context);
-	if(i == weights.end())
+	auto it = weights.find(context);
+	if(it != weights.end())
+	{
+		return it->second;
+	}
+	else
 	{
 		double entropySum = 0.0;
 
@@ -54,15 +58,9 @@ double EntropyInterpolationStrategy::get(const Pattern& context)
 
 		L_S << "Entropyi: get(" << contextSize << ") sum:" << sum << " entropysum:" << entropySum << " entropy:" << entropy << "\n";
 
-//		weights[context] = entropy;
-		weights.emplace(std::make_pair(context, entropy));
+		weights[context] = entropy;
 
 		return entropy;
-
-		// add to map
-	} else
-	{
-		return i->second;
 	}
 }
 

EntropyInterpolationStrategy.h

@@ -11,6 +11,9 @@
 #include "InterpolationStrategy.h"
 #include "LanguageModel.h"
 
+#include <patternstore.h>
+#include <unordered_map>
+
 namespace SLM {
 
 class EntropyInterpolationStrategy: public InterpolationStrategy {
@@ -21,7 +24,8 @@ class EntropyInterpolationStrategy: public InterpolationStrategy {
 	double get(const Pattern& context);
 	std::string name() const;
 protected:
-	std::map<Pattern, double> weights;
+	//std::map<const Pattern, double> weights;
+	std::unordered_map<Pattern, double> weights;
 	SLM::LanguageModel* lm;
 };