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

- fixed upPass(), downPass and added upDownPass()

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@651 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-10 16:20:50 +00:00
parent 82ba72228b
commit 5e99b59fd2
3 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/RbmComponent.cpp
+46 -17
View File
@@ -41,7 +41,7 @@ RbmComponent::RbmComponent (const std::string &name, size_t id, size_t numVisibl
addAndMakeVisible (DrawHidden = new DrawComponent (numHidden, 1));
DrawHidden->setListener(this);
redrawWeights();
redrawReconstruction();
// redrawReconstruction();
setSize (430, 130);
resized();
@@ -195,47 +195,81 @@ void RbmComponent::onDraw(DrawComponent &obj)
{
if (&obj == DrawHidden)
{
downPass(toVisibleProbs(obj.getData()));
downPass(obj.getData());
}
if (&obj == DrawTraining)
{
redrawReconstruction();
upDownPass(obj.getData());
}
}
void RbmComponent::redrawReconstruction()
void RbmComponent::redrawReconstruction(const arma::mat& v)
{
uint32_t i;
for (i=0; i < params().numGibbs; i++)
{
downPass(DrawReconstruction->getData());
DrawHidden->getData() = toHiddenProbs(v);
DrawHidden->DrawData();
DrawReconstruction->getData() = toVisibleProbs(DrawHidden->getData());
DrawReconstruction->DrawData();
}
DrawReconstruction->DrawData();
}
void RbmComponent::upPass(const arma::mat& v)
{
DrawReconstruction->getData() = v;
DrawTraining->getData() = v;
DrawTraining->DrawData();
DrawHidden->getData() = toHiddenProbs(v);
DrawHidden->DrawData();
DrawReconstruction->getData() = toVisibleProbs(DrawHidden->getData());
DrawReconstruction->DrawData();
if (next)
{
RbmComponent *pComp = static_cast<RbmComponent*> (next);
pComp->upPass(toHiddenProbs(v));
pComp->upPass(DrawHidden->getData());
}
}
void RbmComponent::downPass(const arma::mat& v)
void RbmComponent::downPass(const arma::mat& h)
{
DrawReconstruction->getData() = v;
DrawHidden->getData() = h;
DrawHidden->DrawData();
DrawReconstruction->getData() = toVisibleProbs(h);
DrawReconstruction->DrawData();
if (prev)
{
RbmComponent *pComp = static_cast<RbmComponent*> (prev);
pComp->downPass(prev->toVisibleProbs(v));
pComp->downPass(DrawReconstruction->getData());
}
}
void RbmComponent::upDownPass(const arma::mat& v)
{
DrawTraining->getData() = v;
DrawTraining->DrawData();
DrawHidden->getData() = toHiddenProbs(v);
DrawHidden->DrawData();
DrawReconstruction->getData() = toVisibleProbs(DrawHidden->getData());
DrawReconstruction->DrawData();
if (next)
{
RbmComponent *pComp = static_cast<RbmComponent*> (next);
pComp->upDownPass(DrawHidden->getData());
}
else if (prev)
{
if (prev)
{
RbmComponent *pComp = static_cast<RbmComponent*> (prev);
pComp->downPass(DrawReconstruction->getData());
}
}
}
arma::mat RbmComponent::getConvolutedWeight(arma::mat const &w)
{
// if (next)
@@ -263,12 +297,7 @@ void RbmComponent::redrawWeights(size_t index)
void RbmComponent::setTrainingData(arma::mat const& batch)
{
DrawTraining->getData() = trainingData(batch);
DrawTraining->DrawData();
upPass(DrawTraining->getData());
redrawReconstruction();
upDownPass(trainingData(batch));
}
//[/MiscUserCode]