- refactored

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

source/AStack.cpp

@@ -157,3 +157,68 @@ arma::mat AStack::trainingBatchFrom(size_t layerId, const arma::mat& batch)
 	return thisBatch;
 }
 
+arma::mat& AStack::trainingBatch()
+{
+	return m_trainingBatch;
+}
+
+size_t AStack::loadTrainingBatch(const std::string &dir, bool doNormalize)
+{
+	std::string filename = dir + "/" + m_name + ".training.dat";
+	std::string path = dir + "/" + m_name + ".training.dat";
+	bool success = m_trainingBatch.load(filename, arma::arma_ascii);
+
+	if (success)
+	{
+		if (doNormalize)
+		{
+			m_trainingBatch = Rbm::normalize(m_trainingBatch);
+		}
+		std::cout << "Loaded " << m_trainingBatch.n_rows << " training samples\n";
+	}
+	
+	// Migrate context part to training data
+	size_t numTraining = m_trainingBatch.n_rows;
+	size_t numVisible = getLayer(0)->numVisible();
+	
+	if (m_trainingBatch.n_cols < numVisible)
+	{
+		size_t diff = numVisible - m_trainingBatch.n_cols;
+		arma::mat training_with_ctx = arma::join_rows(m_trainingBatch, arma::zeros(numTraining, diff));
+		m_trainingBatch = training_with_ctx;
+	}
+	else if (m_trainingBatch.n_cols > numVisible)
+	{
+		m_trainingBatch = m_trainingBatch.submat(0, 0, numTraining-1, numVisible-1);
+	}
+
+	return m_trainingBatch.n_rows;
+}
+
+size_t AStack::saveTrainingBatch(const std::string &dir)
+{
+	std::string filename = dir + "/" + m_name + ".training.dat";
+	bool success = m_trainingBatch.save(filename, arma::arma_ascii);
+
+	if (success)
+	{
+		std::cout << "Saved " << m_trainingBatch.n_rows << " training samples\n";
+	}
+	
+	return m_trainingBatch.n_rows;
+}
+
+size_t AStack::numTraining()
+{
+	return m_trainingBatch.n_rows;
+}
+
+void AStack::addTraining(const arma::mat &toAdd)
+{ 
+	m_trainingBatch.insert_rows(m_trainingBatch.n_rows, toAdd);
+}
+
+void AStack::delTraining(int index)
+{
+	m_trainingBatch.shed_row(index);
+}