- refactored
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@594 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+10
-10
@@ -31,7 +31,7 @@ Stack::~Stack()
|
||||
{
|
||||
}
|
||||
|
||||
void Stack::addLayer(RbmLayer *pOtherLayer)
|
||||
void Stack::addLayer(Layer *pOtherLayer)
|
||||
{
|
||||
if (!m_pLayers)
|
||||
{
|
||||
@@ -40,7 +40,7 @@ void Stack::addLayer(RbmLayer *pOtherLayer)
|
||||
}
|
||||
else
|
||||
{
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer->upper)
|
||||
{
|
||||
pLayer = pLayer->upper;
|
||||
@@ -50,9 +50,9 @@ void Stack::addLayer(RbmLayer *pOtherLayer)
|
||||
}
|
||||
}
|
||||
|
||||
RbmLayer* Stack::getLayer(size_t layerId) const
|
||||
Layer* Stack::getLayer(size_t layerId) const
|
||||
{
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (pLayer->id() == layerId)
|
||||
@@ -86,7 +86,7 @@ bool Stack::load()
|
||||
int numVisibleY = layer["numVisibleY"].asInt();
|
||||
int numHidden = layer["numHidden"].asInt();
|
||||
|
||||
addLayer(new RbmLayer(layername, i, numVisibleX, numVisibleY, numHidden));
|
||||
addLayer(new Layer(layername, i, numVisibleX, numVisibleY, numHidden));
|
||||
}
|
||||
|
||||
return true;
|
||||
@@ -102,7 +102,7 @@ bool Stack::save()
|
||||
project["stack"]["name"] = m_prjname;
|
||||
|
||||
Json::Value layers(Json::arrayValue);
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
layers.append(pLayer->toJson());
|
||||
@@ -117,7 +117,7 @@ bool Stack::save()
|
||||
|
||||
bool Stack::loadWeights()
|
||||
{
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (!pLayer->loadWeights(m_prjname))
|
||||
@@ -131,7 +131,7 @@ bool Stack::loadWeights()
|
||||
|
||||
bool Stack::saveWeights()
|
||||
{
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (!pLayer->saveWeights(m_prjname))
|
||||
@@ -145,7 +145,7 @@ bool Stack::saveWeights()
|
||||
|
||||
void Stack::train(const arma::mat& batch, size_t miniBatchSize, size_t numEpochs, Rbm::IListener* pListener)
|
||||
{
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
train(pLayer->id(), batch, miniBatchSize, numEpochs, pListener);
|
||||
@@ -156,7 +156,7 @@ void Stack::train(const arma::mat& batch, size_t miniBatchSize, size_t numEpochs
|
||||
void Stack::train(size_t layerId, const arma::mat& batch, size_t miniBatchSize, size_t numEpochs, Rbm::IListener* pListener)
|
||||
{
|
||||
arma::mat thisBatch = batch;
|
||||
RbmLayer *pLayer = m_pLayers;
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (pLayer->id() == layerId)
|
||||
|
||||
Reference in New Issue
Block a user