Added batch training option for ANNEvaluator

matthewlai · matthewlai · commit 13b7fabeb6db · 2016-01-03T15:00:02.000-08:00
diff --git a/ann/ann_evaluator.cpp b/ann/ann_evaluator.cpp
@@ -18,6 +18,7 @@
 #include "ann_evaluator.h"
 
 #include <fstream>
+#include <set>
 
 #include "consts.h"
 
@@ -77,6 +78,16 @@ float ANNEvaluator::Train(const NNMatrixRM &pred, EvalNet::Activations &act, con
 	return ((pred - targets).array() * (pred - targets).array()).sum() / targets.rows();
 }
 
+float ANNEvaluator::Train(const NNMatrixRM &positions, const NNMatrixRM &targets)
+{
+	// in this version (where we don't have predictions already) we can simply call ANN's TrainGDM
+	float e = m_mainAnn.TrainGDM(positions, targets, 1.0f, 1.0f);
+
+	InvalidateCache();
+
+	return e;
+}
+
 void ANNEvaluator::EvaluateForWhiteMatrix(const NNMatrixRM &x, NNMatrixRM &pred, EvalNet::Activations &act)
 {
 	if (act.act.size() == 0)
@@ -136,6 +147,31 @@ Score ANNEvaluator::EvaluateForWhiteImpl(Board &b, Score lowerBound, Score upper
 		return *hashResult;
 	}
 
+	/*
+	static uint64_t hits = 0;
+	static uint64_t misses = 0;
+	static std::set<size_t> seen;
+
+	Board::SlowFeatures sf;
+	b.GetSlowFeatures(sf);
+	size_t hash = sf.Hash();
+
+	if (seen.find(hash) != seen.end())
+	{
+		++hits;
+	}
+	else
+	{
+		++misses;
+		seen.insert(hash);
+	}
+
+	if (((misses + hits) % 1000000) == 0)
+	{
+		std::cout << hits << "/" << misses << " (" << (static_cast<float>(hits) / (hits + misses)) << ")" << std::endl;
+	}
+	*/
+
 	FeaturesConv::ConvertBoardToNN(b, m_convTmp);
 
 	// we have to map every time because the vector's buffer could have moved
diff --git a/ann/ann_evaluator.h b/ann/ann_evaluator.h
@@ -70,6 +70,8 @@ class ANNEvaluator : public EvaluatorIface
 
 	float Train(const NNMatrixRM &pred, EvalNet::Activations &act, const NNMatrixRM &targets);
 
+	float Train(const NNMatrixRM &positions, const NNMatrixRM &targets);
+
 	// this is a special bulk evaluate for training
 	void EvaluateForWhiteMatrix(const NNMatrixRM &x, NNMatrixRM &pred, EvalNet::Activations &act);
 
