- moved all functions to Layer

- added Stack

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

source/Layer.cpp

@@ -14,10 +14,12 @@
 #include "Layer.hpp"
 using namespace std;
 
-Layer::Layer(const string &prjname, size_t id, size_t numVisible, size_t numHidden)
+Layer::Layer(const string &prjname, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden)
 : m_prjname(prjname)
 , m_id(id)
-, m_rbm(m_rbm_params, numVisible, numHidden)
+, m_numVisibleX(numVisibleX)
+, m_numVisibleY(numVisibleY)
+, m_rbm(m_rbm_params, numVisibleX*numVisibleY, numHidden)
 {
 	
 }
@@ -25,23 +27,85 @@ Layer::Layer(const string &prjname, size_t id, size_t numVisible, size_t numHidd
 Layer::Layer(const Layer& orig)
 : m_prjname(orig.m_prjname)
 , m_id(orig.m_id)
+, m_numVisibleX(orig.m_numVisibleX)
+, m_numVisibleY(orig.m_numVisibleY)
 , m_rbm_params(orig.m_rbm_params)
 , m_rbm(orig.m_rbm)
 {
+	m_weightsFile = m_prjname + string(".weights.dat");
 }
 
 Layer::~Layer()
 {
 }
 
+void Layer::saveWeight()
+{
+	FILE *pFile;
+
+	pFile = fopen(m_weightsFile.c_str(), "w");
+
+	if (!pFile)
+	{
+		std::cout << "Could not open " << m_weightsFile << "!" << std::endl;
+		return;
+	}
+
+	const arma::mat &bv = rbm().bv();
+	const arma::mat &bh = rbm().bh();
+	const arma::mat &w = rbm().w();
+	
+	size_t numHidden = bh.n_elem;
+	size_t numVisible = bv.n_elem;
+	fprintf(pFile, "%d %d %d\n", (int)m_numVisibleX, (int)m_numVisibleY, (int)numHidden);
+
+	uint32_t i, j;
+
+	for (i=0; i < numVisible; i++)
+	{
+		fprintf(pFile, "%3.6f\n", bv(i));
+	}
+	for (i=0; i < numHidden; i++)
+	{
+		fprintf(pFile, "%3.6f\n", bh(i));
+	}
+	for (i=0; i < numVisible; i++)
+	{
+		for (j=0; j < numHidden; j++)
+		{
+			fprintf(pFile, "%3.6f ", w(i,j));
+		}
+		fprintf(pFile, "\n");
+	}
+
+	fclose(pFile);
+
+}
+
+Rbm& Layer::rbm() 
+{
+	return m_rbm;
+}
+
 Json::Value Layer::toJson() const
 {
 	Json::Value layer;
 	layer["name"] = string("Layer ") + to_string((int)m_id);
 	layer["weights_file"] = m_prjname + string(".weights.dat");
+	layer["numVisibleX"] = to_string((int)m_numVisibleX);
+	layer["numVisibleY"] = to_string((int)m_numVisibleX);
 	layer["rbm"] = m_rbm.toJson();
 	
 	return layer;
 
 }
 
+void Layer::up_pass(const arma::mat& v)
+{
+
+}
+
+void Layer::down_pass(arma::mat& dst, const arma::mat& src)
+{
+
+}