- refactored

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@825 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2022-01-17 20:34:44 +00:00
parent 51e6eef12e
commit 9b2861e3d8
5 changed files with 81 additions and 84 deletions
-66
View File
@@ -52,72 +52,6 @@ void DeepStack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pL
pLayer->train(thisBatch, pListener);
}
arma::mat& DeepStack::trainingBatch()
{
return m_trainingBatch;
}
size_t DeepStack::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 DeepStack::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 DeepStack::numTraining()
{
return m_trainingBatch.n_rows;
}
void DeepStack::addTraining(const arma::mat &toAdd)
{
m_trainingBatch.insert_rows(m_trainingBatch.n_rows, toAdd);
}
void DeepStack::delTraining(int index)
{
m_trainingBatch.shed_row(index);
}
arma::mat DeepStack::upPass(size_t layerId, const arma::mat& v)
{
arma::mat h = arma::zeros(0,0);