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

- pass numContext

Browse Source 
- fixed crash when numContext == 0

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@761 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-01-09 08:01:25 +00:00
parent 0ee0a732e9
commit c2ffecd66a
10 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Layer.cpp
+10 -7
View File
@@ -14,8 +14,8 @@
#include "Layer.hpp"
using namespace std;
Layer::Layer(const string &name, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden)
: Rbm(numVisibleX*numVisibleY, numHidden, numHidden)
Layer::Layer(const string &name, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden, size_t numContext)
: Rbm(numVisibleX*numVisibleY, numHidden, numContext)
, next(nullptr)
, prev(nullptr)
, m_name(name)
@@ -73,23 +73,25 @@ bool Layer::loadWeights(const string &prjname)
int i, j;
float v;
arma::mat _bv(1, numVisible);
for (i=0; i < numVisible; i++)
{
result = fscanf(pFile, "%f", &v);
if (result > 0)
{
m_bv(i) = v;
_bv(i) = v;
}
}
arma::mat _bhv(1, numHidden);
for (i=0; i < numHidden; i++)
{
result = fscanf(pFile, "%f", &v);
if (result > 0)
{
m_bhv(i) = v;
_bhv(i) = v;
}
}
arma::mat weights(numVisible, numHidden);
arma::mat _whv(numVisible, numHidden);
for (i=0; i < numVisible; i++)
{
for (j=0; j < numHidden; j++)
@@ -98,11 +100,11 @@ bool Layer::loadWeights(const string &prjname)
result = fscanf(pFile, "%f", &v);
if (result > 0)
{
weights(i, j) = v;
_whv(i, j) = v;
}
}
}
weightsAssign(weights);
weightsAssign(_whv, _bhv, _bv);
fclose(pFile);
return true;
@@ -162,6 +164,7 @@ Json::Value Layer::toJson() const
layer["numVisibleX"] = (int)m_numVisibleX;
layer["numVisibleY"] = (int)m_numVisibleY;
layer["numHidden"] = (int)whv().n_cols;
layer["numContext"] = numContext();
layer["rbm"] = Rbm::toJson();
return layer;