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

- added Stack::save()

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@579 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-10-25 17:30:31 +00:00
parent 5c01e7d4ce
commit 7aa3f0a747
6 changed files with 110 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ILayer.hpp
-5
View File
@@ -32,11 +32,6 @@ public:
virtual void up_pass(arma::mat const &v) = 0;
virtual void down_pass(arma::mat &dst, arma::mat const &src) = 0;
void registerLayer(ILayer *pLayer)
{
lower = pLayer;
pLayer->upper = this;
}
};
source/Layer.cpp
+11 -9
View File
@@ -15,35 +15,37 @@
using namespace std;
Layer::Layer(const string &prjname, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden)
: m_prjname(prjname)
: upper(nullptr)
, lower(nullptr)
, m_prjname(prjname)
, m_id(id)
, m_numVisibleX(numVisibleX)
, m_numVisibleY(numVisibleY)
, m_rbm(m_rbm_params, numVisibleX*numVisibleY, numHidden)
{
m_weightsFile = m_prjname + string(".weights.") + to_string((int)m_id) + string(".dat");
}
Layer::Layer(const Layer& orig)
: m_prjname(orig.m_prjname)
: upper(nullptr)
, lower(nullptr)
, m_prjname(orig.m_prjname)
, m_weightsFile(orig.m_weightsFile)
, m_id(orig.m_id)
, m_numVisibleX(orig.m_numVisibleX)
, m_numVisibleY(orig.m_numVisibleY)
, m_rbm_params(orig.m_rbm_params)
, m_rbm(orig.m_rbm)
{
m_weightsFile = m_prjname + string(".weights.dat");
}
Layer::~Layer()
{
}
void Layer::saveWeight()
void Layer::saveWeights()
{
FILE *pFile;
pFile = fopen(m_weightsFile.c_str(), "w");
FILE *pFile = fopen(m_weightsFile.c_str(), "w");
if (!pFile)
{
@@ -91,7 +93,7 @@ Json::Value Layer::toJson() const
{
Json::Value layer;
layer["name"] = string("Layer ") + to_string((int)m_id);
layer["weights_file"] = m_prjname + string(".weights.dat");
layer["weights_file"] = m_weightsFile;
layer["numVisibleX"] = to_string((int)m_numVisibleX);
layer["numVisibleY"] = to_string((int)m_numVisibleX);
layer["rbm"] = m_rbm.toJson();
source/Layer.hpp
+12 -4
View File
@@ -21,20 +21,28 @@
#include "Rbm.hpp"
#include "ILayer.hpp"
class Layer : public ILayer
class Layer
{
public:
Layer *upper;
Layer *lower;
Layer(const std::string &prjname, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden);
Layer(const Layer& orig);
virtual ~Layer();
Json::Value toJson() const;
Rbm& rbm();
void saveWeight();
void saveWeights();
void up_pass(const arma::mat& v) override;
void down_pass(arma::mat& dst, const arma::mat& src) override;
void up_pass(const arma::mat& v);
void down_pass(arma::mat& dst, const arma::mat& src);
size_t id()
{
return m_id;
}
private:
const std::string &m_prjname;
std::string m_weightsFile;
source/Stack.cpp
+64 -1
View File
@@ -13,11 +13,17 @@
#include "Stack.hpp"
Stack::Stack()
using namespace std;
Stack::Stack(const std::string &prjname)
: m_prjname(prjname)
, m_pLayers(nullptr)
{
}
Stack::Stack(const Stack& orig)
: m_prjname(orig.m_prjname)
, m_pLayers(orig.m_pLayers)
{
}
@@ -25,3 +31,60 @@ Stack::~Stack()
{
}
void Stack::addLayer(Layer *pOtherLayer)
{
if (!m_pLayers)
{
m_pLayers = pOtherLayer;
pOtherLayer->lower = nullptr;
}
else
{
Layer *pLayer = m_pLayers;
while(pLayer->upper)
{
pLayer = pLayer->upper;
}
pLayer->upper = pOtherLayer;
pOtherLayer->lower = pLayer;
}
}
const Layer* Stack::getLayer(size_t id)
{
Layer *pLayer = m_pLayers;
while(pLayer)
{
if (pLayer->id() == id)
{
return pLayer;
}
pLayer = pLayer->upper;
}
return nullptr;
}
void Stack::save(size_t numTraining)
{
ofstream ofs(m_prjname + string(".prj"));
Json::StyledWriter writer;
Json::Value project;
project["stack"]["name"] = m_prjname;
project["stack"]["num_training"] = (int)numTraining;
project["stack"]["training_file"] = m_prjname + string(".training.dat");
Json::Value layers(Json::arrayValue);
Layer *pLayer = m_pLayers;
while(pLayer)
{
layers.append(pLayer->toJson());
pLayer = pLayer->upper;
}
project["stack"]["layers"] = layers;
ofs << writer.write(project);
}
source/Stack.hpp
+9 -4
View File
@@ -14,6 +14,8 @@
#ifndef STACK_HPP
#define STACK_HPP
#include <string>
#include <vector>
#include <armadillo>
#include <jsoncpp/json/json.h>
#include "Layer.hpp"
@@ -21,15 +23,18 @@
class Stack
{
public:
Stack();
Stack(const std::string &prjname);
Stack(const Stack& orig);
virtual ~Stack();
void addLayer(const Layer &layer);
const Layer& getLayer();
void addLayer(Layer *pLayer);
const Layer* getLayer(size_t id);
void save(size_t numTraining);
private:
const std::string &m_prjname;
Layer *m_pLayers;
};
#endif /* STACK_HPP */
source/main.cpp
+14 -26
View File
@@ -8,6 +8,7 @@
#include <jsoncpp/json/json.h>
#include "Rbm.hpp"
#include "Layer.hpp"
#include "Stack.hpp"
using namespace std;
class RbmListener : public Rbm::IListener
@@ -74,31 +75,11 @@ arma::mat loadTraining(const string &filename)
}
void saveProject(const string &prjname, const Layer &layer, size_t numTraining)
{
ofstream ofs(prjname + string(".prj"));
Json::StyledWriter writer;
Json::Value project;
project["project"]["name"] = prjname;
project["project"]["num_training"] = (int)numTraining;
project["project"]["training_file"] = prjname + string(".training.dat");
Json::Value jsonLayer = layer.toJson();
Json::Value jsonLayers(Json::arrayValue);
jsonLayers.append(jsonLayer);
project["project"]["layers"] = jsonLayers;
ofs << writer.write(project);
}
int main()
{
printf("Hallo, Welt!\n");
const string project("mnist");
const string project("mnist_2");
RbmListener statusDisplay;
Rbm::Params rbmParams;
@@ -110,15 +91,22 @@ int main()
size_t numVisibleY = 28;
size_t numHidden = 64;
Layer layer(project, 0, numVisibleX, numVisibleY, numHidden);
saveProject(project, layer, numTraining);
printf("Loaded %d training samples\n", (int)numTraining);
Layer layer(project, 0, numVisibleX, numVisibleY, numHidden);
Layer layer1(project, 1, numVisibleX, numVisibleY, numHidden);
Layer layer2(project, 2, numVisibleX, numVisibleY, numHidden);
Layer layer3(project, 3, numVisibleX, numVisibleY, numHidden);
Stack stack(project);
stack.addLayer(&layer);
stack.addLayer(&layer1);
stack.addLayer(&layer2);
stack.addLayer(&layer3);
stack.save(numTraining);
Rbm &rbm = layer.rbm();
rbm.train(batch, 1000, 100, &statusDisplay);
layer.saveWeight();
layer.saveWeights();
arma::mat v = arma::randu(numTraining, numVisibleX*numVisibleY);
arma::mat h = rbm.toHiddenProbs(v);
arma::mat r = rbm.toVisibleProbs(h);