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

- fixed progress indicator

Browse Source 
- cleaned up


git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@624 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-07 16:21:35 +00:00
parent 5d281ddca6
commit 4e21dd8114
5 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/MainComponent.cpp
+11 -11
View File
@@ -499,16 +499,14 @@ void MainComponent::buttonClicked (Button* buttonThatWasClicked)
{
//[UserButtonCode_addButton] -- add your button handler code here..
// m_layers.add(m_pRbmComponent[0]->getTrainingData(), m_weights[0]->getNumVisible());
// m_pRbmComponent[0]->batchchanged();
//[/UserButtonCode_addButton]
}
else if (buttonThatWasClicked == ShakeButton)
{
//[UserButtonCode_ShakeButton] -- add your button handler code here..
m_pLayer->weightsInit(weightInitLabel->getText().getFloatValue());
// m_pLayer->batchchanged();
// m_pLayer->redrawWeights();
// m_pLayer->redrawReconstruction();
m_pLayer->redrawWeights();
m_pLayer->redrawReconstruction();
//[/UserButtonCode_ShakeButton]
}
else if (buttonThatWasClicked == createButton)
@@ -529,6 +527,7 @@ void MainComponent::buttonClicked (Button* buttonThatWasClicked)
m_rbmSelect->addItem(String(id), id+1);
}
m_rbmSelect->setSelectedId(1, sendNotification);
loadTraining();
//[/UserButtonCode_loadButton]
}
else if (buttonThatWasClicked == saveButton)
@@ -540,28 +539,25 @@ void MainComponent::buttonClicked (Button* buttonThatWasClicked)
else if (buttonThatWasClicked == loadTrainingButton)
{
//[UserButtonCode_loadTrainingButton] -- add your button handler code here..
loadTraining((String(getBaseDir() + String(".trainingStates.dat"))).toUTF8());
m_stack->batchchanged();
loadTraining();
//[/UserButtonCode_loadTrainingButton]
}
else if (buttonThatWasClicked == saveTrainingButton)
{
//[UserButtonCode_saveTrainingButton] -- add your button handler code here..
saveTraining((String(getBaseDir() + String(".trainingStates.dat"))).toUTF8());
saveTraining();
//[/UserButtonCode_saveTrainingButton]
}
else if (buttonThatWasClicked == clearTrainingButton)
{
//[UserButtonCode_clearTrainingButton] -- add your button handler code here..
clearTraining();
m_stack->batchchanged();
//[/UserButtonCode_clearTrainingButton]
}
else if (buttonThatWasClicked == removeTrainingButton)
{
//[UserButtonCode_removeTrainingButton] -- add your button handler code here..
removeTrainingAt((int)patterSlider->getValue());
m_stack->batchchanged();
//[/UserButtonCode_removeTrainingButton]
}
else if (buttonThatWasClicked == rbmDoRaoBlackwellToggleButton)
@@ -621,6 +617,7 @@ void MainComponent::sliderValueChanged (Slider* sliderThatWasMoved)
{
//[UserSliderCode_patterSlider] -- add your slider handling code here..
m_trainingIndex = (int)sliderThatWasMoved->getValue();
m_pLayer->setTrainingIndex(m_trainingData.row(m_trainingIndex));
//[/UserSliderCode_patterSlider]
}
else if (sliderThatWasMoved == WeightsSlider)
@@ -653,6 +650,7 @@ void MainComponent::labelTextChanged (Label* labelThatHasChanged)
if (labelThatHasChanged == numEpochslabel)
{
//[UserLabelCode_numEpochslabel] -- add your label text handling code here..
m_pLayer->params().numEpochs = labelThatHasChanged->getText().getFloatValue();
//[/UserLabelCode_numEpochslabel]
}
else if (labelThatHasChanged == learningRateLabel)
@@ -726,6 +724,7 @@ void MainComponent::labelTextChanged (Label* labelThatHasChanged)
else if (labelThatHasChanged == sizeMiniBatch)
{
//[UserLabelCode_sizeMiniBatch] -- add your label text handling code here..
m_pLayer->params().miniBatchSize = labelThatHasChanged->getText().getFloatValue();
//[/UserLabelCode_sizeMiniBatch]
}
@@ -741,7 +740,7 @@ void MainComponent::comboBoxChanged (ComboBox* comboBoxThatHasChanged)
if (comboBoxThatHasChanged == m_rbmSelect)
{
int index = m_rbmSelect->getSelectedItemIndex();
m_pLayer = m_stack->getLayer(index);
m_pLayer = static_cast<RbmComponent*>(m_stack->getLayer(index));
updateControls();
//[/UserComboBoxCode_m_rbmSelect]
}
@@ -881,9 +880,10 @@ void MainComponent::run()
m_pLayer->train(m_trainingData);
}
void MainComponent::onProgressChanged(size_t progressPercent)
bool MainComponent::onProgressChanged(size_t progressPercent)
{
m_progressBarSlider->setValue(progressPercent);
return !m_doStop;
}
void MainComponent::updateControls()