- Layer:don't store weight layout info. It's already stored in prj-file

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

source/Layer.cpp

@@ -47,10 +47,6 @@ Layer::~Layer()
 
 bool Layer::loadWeights(const string &prjname)
 {
-	int numVisibleX;
-	int numVisibleY;
-	int numHidden;
-
 	string filename = m_weightsFile;
 	if (prjname.size() > 0)
 	{
@@ -65,16 +61,12 @@ bool Layer::loadWeights(const string &prjname)
 	}
 
 	std::cout << "Importing weights for " << m_name << "." << to_string((int)m_id) << std::endl;
-	int result = fscanf(pFile, "%d %d %d\n", &numVisibleX, &numVisibleY, &numHidden);
-	if (result < 0)
-	{
-		return false;
-	}
 
-	size_t numVisible = numVisibleX*numVisibleY;
-	
+	size_t numVisible = Rbm::numVisible();
+	size_t numHidden = Rbm::numHidden();
 	int i, j;
 	float v;
+	int result;
 	arma::mat _bv(1, numVisible);
 	for (i=0; i < numVisible; i++)
 	{
@@ -131,7 +123,6 @@ bool Layer::saveWeights(const string &prjname)
 
 	std::cout << "Exporting weights for " << m_name << "." << to_string((int)m_id) << std::endl;
 
-	fprintf(pFile, "%d %d %d\n", (int)m_numVisibleX, (int)m_numVisibleY, numHidden);
 	int i, j;
 
 	for (i=0; i < numVisible; i++)