jens/Rbm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- refactored

Browse Source 
- constify
This commit is contained in:
jens
2024-01-22 12:26:03 +01:00
parent d99cf5ee4c
commit 938368f1fa
14 changed files with 102 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/DeepStack.cpp
+18 -37
View File
@@ -24,18 +24,18 @@ DeepStack::~DeepStack()
{
}
arma::mat DeepStack::trainingBatchFrom(size_t layerId, const arma::mat& batch)
arma::mat DeepStack::trainingBatchFrom(Layer *pLayer, const arma::mat& batch)
{
arma::mat thisBatch = batch;
Layer *pLayer = getLayer(0);
while (pLayer)
Layer *pLayerForward = getFirstLayer();
while (pLayerForward)
{
if (pLayer->id() == layerId)
if (pLayerForward == pLayer)
{
break;
}
thisBatch = pLayer->toHiddenProbs(thisBatch);
pLayer = pLayer->next;
thisBatch = pLayerForward->toHiddenProbs(thisBatch);
pLayerForward = pLayerForward->next;
}
return thisBatch;
}
@@ -43,48 +43,21 @@ arma::mat DeepStack::trainingBatchFrom(size_t layerId, const arma::mat& batch)
void DeepStack::train(const arma::mat& batch, Rbm::IListener* pListener)
{
arma::mat thisBatch = batch;
Layer *pLayer = getLayer(0);
Layer *pLayer = getFirstLayer();
while (pLayer)
{
thisBatch = trainingBatchFrom(pLayer->id(), thisBatch);
thisBatch = trainingBatchFrom(pLayer, thisBatch);
pLayer->train(thisBatch, pListener);
pLayer = pLayer->next;
}
}
void DeepStack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener)
void DeepStack::train(Layer *pLayer, const arma::mat& batch, Rbm::IListener* pListener)
{
arma::mat thisBatch = batch;
Layer *pLayer = getLayer(0);
while (pLayer)
{
if (pLayer->id() == layerId)
{
break;
}
thisBatch = pLayer->toHiddenProbs(thisBatch);
pLayer = pLayer->next;
}
arma::mat thisBatch = trainingBatchFrom(pLayer, batch);
pLayer->train(thisBatch, pListener);
}
arma::mat DeepStack::upPass(size_t layerId, const arma::mat& v)
{
return upPass(getLayer(layerId), v);
}
arma::mat DeepStack::downPass(size_t layerId, const arma::mat& h)
{
return downPass(getLayer(layerId), h);
}
arma::mat DeepStack::upDownPass(size_t layerId, const arma::mat& v)
{
arma::mat h = upPass(layerId, v);
arma::mat r = downPass(numLayers()-1, h);
return r;
}
arma::mat DeepStack::upPass(Layer *pLayer, arma::mat const &v)
{
arma::mat h = v;
@@ -112,3 +85,11 @@ arma::mat DeepStack::downPass(Layer *pLayer, arma::mat const &h)
}
return v;
}
arma::mat DeepStack::upDownPass(Layer *pLayer, const arma::mat& v)
{
arma::mat h = upPass(pLayer, v);
arma::mat r = downPass(getLastLayer(), h);
return r;
}