- committed last changes

git-svn-id: http://moon:8086/svn/software/trunk/projects/RBM@359 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
2018-06-12 17:01:49 +00:00
parent 9f8d84008c
commit 80a67ba314
15 changed files with 155 additions and 264 deletions
-14
View File
@@ -46,12 +46,10 @@ RbmComponent::RbmComponent (Weights &_weights, RbmComponent *pRbmUpper, RbmCompo
addAndMakeVisible (DrawWeights = new DrawComponent (getTopWeights().getNumVisibleX(), getTopWeights().getNumVisibleY(), 0.5, 0.5));
addAndMakeVisible (DrawVars = new DrawComponent (vNumX, vNumY));
addAndMakeVisible (DrawHidden = new DrawComponent (hNum, 1));
DrawHidden->setListener(this);
redrawWeights();
redrawReconstruction();
redrawVariances();
setSize (430, 130);
resized();
@@ -80,12 +78,10 @@ RbmComponent::RbmComponent (Weights &_weights, MatrixXd const &batch, RbmCompone
addAndMakeVisible (DrawWeights = new DrawComponent (getTopWeights().getNumVisibleX(), getTopWeights().getNumVisibleY(), 0.5, 0.5));
addAndMakeVisible (DrawVars = new DrawComponent (vNumX, vNumY));
addAndMakeVisible (DrawHidden = new DrawComponent (hNum, 1));
DrawHidden->setListener(this);
redrawWeights();
redrawReconstruction();
redrawVariances();
setSize (430, 130);
resized();
@@ -116,7 +112,6 @@ RbmComponent::~RbmComponent()
DrawTraining = nullptr;
DrawReconstruction = nullptr;
DrawWeights = nullptr;
DrawVars = nullptr;
DrawHidden = nullptr;
//[/Destructor]
}
@@ -198,7 +193,6 @@ void RbmComponent::resized()
DrawTraining->setBoundsRelative(0, 0, 100./430, 100./130);
DrawReconstruction->setBoundsRelative(110./430, 0, 100./430, 100./130);
DrawWeights->setBoundsRelative (220./430, 0, 100./430, 100./130);
DrawVars->setBoundsRelative (330./430, 0, 100./430, 100./130);
DrawHidden->setBoundsRelative (0, 110./130, 430./430, 20./130);
}
@@ -305,16 +299,9 @@ void RbmComponent::redrawWeights()
DrawWeights->DrawData();
}
void RbmComponent::redrawVariances()
{
DrawVars->getData() = getVariableSigma();
DrawVars->DrawData();
}
void RbmComponent::onParamsChanged()
{
redrawWeights();
redrawVariances();
redrawReconstruction();
}
@@ -325,7 +312,6 @@ void RbmComponent::batchchanged()
{
lower->batchchanged();
}
redrawVariances();
}
void RbmComponent::setWeightsIndex(size_t index)