- gibbsDoSampleHidden and gibbsDoSampleVisible onl used only training
- very good results git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@852 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+27
-33
@@ -108,24 +108,10 @@ void Rbm::gibbs_vh(arma::mat &v_probs, arma::mat &h_probs)
|
||||
for (int i=0; i < m_params.numGibbs; i++)
|
||||
{
|
||||
// Create hidden representation given v
|
||||
if (m_params.gibbsDoSampleVisible)
|
||||
{
|
||||
h_probs = prob(v_to_h(sample(v_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
h_probs = prob(v_to_h(v_probs));
|
||||
}
|
||||
h_probs = prob(v_to_h(v_probs));
|
||||
|
||||
// Create visible reconstruction (a fantasy...) given hid
|
||||
if (m_params.gibbsDoSampleHidden)
|
||||
{
|
||||
v_probs = prob(h_to_v(sample(h_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
v_probs = prob(h_to_v(h_probs));
|
||||
}
|
||||
v_probs = prob(h_to_v(h_probs));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -134,24 +120,10 @@ void Rbm::gibbs_hv(arma::mat &h_probs, arma::mat &v_probs)
|
||||
for (int i=0; i < m_params.numGibbs; i++)
|
||||
{
|
||||
// Create visible reconstruction (a fantasy...) given hid
|
||||
if (m_params.gibbsDoSampleHidden)
|
||||
{
|
||||
v_probs = prob(h_to_v(sample(h_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
v_probs = prob(h_to_v(h_probs));
|
||||
}
|
||||
v_probs = prob(h_to_v(h_probs));
|
||||
|
||||
// Create hidden representation given v
|
||||
if (m_params.gibbsDoSampleVisible)
|
||||
{
|
||||
h_probs = prob(v_to_h(sample(v_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
h_probs = prob(v_to_h(v_probs));
|
||||
}
|
||||
h_probs = prob(v_to_h(v_probs));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -176,7 +148,29 @@ void Rbm::contrastiveDivergence(arma::mat const &v_states, arma::mat &dw, arma::
|
||||
dbv = sum(v_states, 0);
|
||||
dbhv = sum(h_states, 0);
|
||||
|
||||
gibbs_hv(h_probs, v_probs);
|
||||
// Gibbs sampling with training params
|
||||
for (int i=0; i < m_params.numGibbs; i++)
|
||||
{
|
||||
// Create visible reconstruction (a fantasy...) given hid
|
||||
if (m_params.gibbsDoSampleHidden)
|
||||
{
|
||||
v_probs = prob(h_to_v(sample(h_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
v_probs = prob(h_to_v(h_probs));
|
||||
}
|
||||
|
||||
// Create hidden representation given v
|
||||
if (m_params.gibbsDoSampleVisible)
|
||||
{
|
||||
h_probs = prob(v_to_h(sample(v_probs)));
|
||||
}
|
||||
else
|
||||
{
|
||||
h_probs = prob(v_to_h(v_probs));
|
||||
}
|
||||
}
|
||||
|
||||
// Update weights (negative phase)
|
||||
dw -= v_probs.t() * h_probs;
|
||||
|
||||
Reference in New Issue
Block a user