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

- update RbmComponents on enable/disable

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@656 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-11 18:03:20 +00:00
parent 12f08b38bc
commit 7a79b48e5c
3 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/MainComponent.cpp
+3 -3
View File
@@ -505,7 +505,7 @@ void MainComponent::buttonClicked (Button* buttonThatWasClicked)
//[UserButtonCode_ShakeButton] -- add your button handler code here.. //[UserButtonCode_ShakeButton] -- add your button handler code here..
m_pLayer->weightsInit(weightInitLabel->getText().getFloatValue()); m_pLayer->weightsInit(weightInitLabel->getText().getFloatValue());
m_pLayer->redrawWeights(); m_pLayer->redrawWeights();
m_pLayer->redrawReconstruction(m_stack->trainingData(m_pLayer).row(m_trainingIndex)); m_pLayer->redrawReconstruction();
//[/UserButtonCode_ShakeButton] //[/UserButtonCode_ShakeButton]
} }
else if (buttonThatWasClicked == createButton) else if (buttonThatWasClicked == createButton)
@@ -641,7 +641,7 @@ void MainComponent::sliderValueChanged (Slider* sliderThatWasMoved)
{ {
//[UserSliderCode_numGibbsSlider] -- add your slider handling code here.. //[UserSliderCode_numGibbsSlider] -- add your slider handling code here..
m_pLayer->params().numGibbs = sliderThatWasMoved->getValue(); m_pLayer->params().numGibbs = sliderThatWasMoved->getValue();
m_pLayer->redrawReconstruction(m_stack->trainingData().row(m_trainingIndex)); m_pLayer->redrawReconstruction();
//[/UserSliderCode_numGibbsSlider] //[/UserSliderCode_numGibbsSlider]
} }
else if (sliderThatWasMoved == m_progressBarSlider) else if (sliderThatWasMoved == m_progressBarSlider)
@@ -841,7 +841,7 @@ bool MainComponent::onProgress(Rbm *pRbm, const Rbm::Status &status)
{ {
RbmComponent *pComp = static_cast<RbmComponent*>(pRbm); RbmComponent *pComp = static_cast<RbmComponent*>(pRbm);
pComp->upPass(pComp->DrawTraining->getData()); pComp->upPass(pComp->DrawTraining->getData());
pComp->redrawReconstruction(pComp->DrawTraining->getData()); pComp->redrawReconstruction();
pComp->redrawWeights(); pComp->redrawWeights();
m_progressBarSlider->setValue(status.progress); m_progressBarSlider->setValue(status.progress);
source/RbmComponent.cpp
+6 -10
View File
@@ -218,20 +218,15 @@ void RbmComponent::buttonClicked(Button* buttonThatWasClicked)
RbmComponent *pComp = static_cast<RbmComponent*> (next); RbmComponent *pComp = static_cast<RbmComponent*> (next);
pComp->enable(state); pComp->enable(state);
} }
redrawReconstruction();
} }
} }
void RbmComponent::redrawReconstruction(const arma::mat& v) void RbmComponent::redrawReconstruction()
{ {
uint32_t i; RbmComponent *pComp = static_cast<RbmComponent*> (root());
pComp->upDownPass(pComp->DrawTraining->getData());
for (i=0; i < params().numGibbs; i++)
{
DrawHidden->getData() = toHiddenProbs(v);
DrawHidden->DrawData();
DrawReconstruction->getData() = toVisibleProbs(DrawHidden->getData());
DrawReconstruction->DrawData();
}
} }
void RbmComponent::upPass(const arma::mat& v) void RbmComponent::upPass(const arma::mat& v)
@@ -322,7 +317,8 @@ void RbmComponent::redrawWeights(size_t index)
void RbmComponent::setTrainingData(arma::mat const& batch) void RbmComponent::setTrainingData(arma::mat const& batch)
{ {
upDownPass(trainingData(batch)); RbmComponent *pComp = static_cast<RbmComponent*> (root());
pComp->upDownPass(batch);
} }
//[/MiscUserCode] //[/MiscUserCode]
source/RbmComponent.hpp
+1 -1
View File
@@ -64,7 +64,7 @@ public:
void redrawWeights(); void redrawWeights();
void redrawWeights(size_t index); void redrawWeights(size_t index);
void redrawReconstruction(arma::mat const &v); void redrawReconstruction();
void upPass(arma::mat const &v); void upPass(arma::mat const &v);
void downPass(arma::mat const &v); void downPass(arma::mat const &v);