- moved context awareness from Rbm to Layer (final)

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@770 b431acfa-c32f-4a4a-93f1-934dc6c82436

source/Layer.cpp

@@ -15,13 +15,14 @@
 using namespace std;
 
 Layer::Layer(const string &name, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden, size_t numContext)
-: Rbm(numVisibleX*numVisibleY, numHidden, numContext)
+: Rbm(numVisibleX*numVisibleY+numContext, numHidden)
 , next(nullptr)	
 , prev(nullptr)	
 , m_name(name)
 , m_id(id)
 , m_numVisibleX(numVisibleX)
 , m_numVisibleY(numVisibleY)
+, m_numContext(numContext)
 {
 	cout << "Create Layer " << m_name << "." << to_string((int)m_id) << endl;
 	m_weightsFile = m_name + "." + to_string((int)m_id) + string(".weights.dat");
@@ -164,7 +165,7 @@ Json::Value Layer::toJson() const
 	layer["numVisibleX"] = (int)m_numVisibleX;
 	layer["numVisibleY"] = (int)m_numVisibleY;
 	layer["numHidden"] = (int)whv().n_cols;
-	layer["numContext"] = numContext();
+	layer["numContext"] = m_numContext;
 	layer["rbm"] = Rbm::toJson();
 	
 	return layer;