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

- store string by value

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@617 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-11-07 13:13:33 +00:00
parent d5959d9ea2
commit 30555df649
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Layer.hpp
+1 -1
View File
@@ -58,7 +58,7 @@ public:
return m_bh.n_elem; return m_bh.n_elem;
} }
private: private:
const std::string &m_name; std::string m_name;
std::string m_weightsFile; std::string m_weightsFile;
size_t m_id; size_t m_id;
size_t m_numVisibleX; size_t m_numVisibleX;
source/Stack.cpp
+11 -11
View File
@@ -15,14 +15,14 @@
using namespace std; using namespace std;
Stack::Stack(const std::string &prjname) Stack::Stack(const std::string &name)
: m_prjname(prjname) : m_name(name)
, m_pLayers(nullptr) , m_pLayers(nullptr)
{ {
} }
Stack::Stack(const Stack& orig) Stack::Stack(const Stack& orig)
: m_prjname(orig.m_prjname) : m_name(orig.m_name)
, m_pLayers(orig.m_pLayers) , m_pLayers(orig.m_pLayers)
{ {
} }
@@ -78,8 +78,8 @@ Layer* Stack::getLayer(size_t layerId) const
bool Stack::load() bool Stack::load()
{ {
std::cout << "Importing Project " << m_prjname << std::endl; std::cout << "Importing Project " << m_name << std::endl;
ifstream ifs(m_prjname + string(".prj")); ifstream ifs(m_name + string(".prj"));
Json::Reader reader; Json::Reader reader;
Json::Value project; Json::Value project;
@@ -106,12 +106,12 @@ bool Stack::load()
bool Stack::save() bool Stack::save()
{ {
std::cout << "Exporting Project " << m_prjname << std::endl; std::cout << "Exporting Project " << m_name << std::endl;
ofstream ofs(m_prjname + string(".prj")); ofstream ofs(m_name + string(".prj"));
Json::StyledWriter writer; Json::StyledWriter writer;
Json::Value project; Json::Value project;
project["stack"]["name"] = m_prjname; project["stack"]["name"] = m_name;
Json::Value layers(Json::arrayValue); Json::Value layers(Json::arrayValue);
Layer *pLayer = m_pLayers; Layer *pLayer = m_pLayers;
@@ -142,7 +142,7 @@ bool Stack::loadWeights()
Layer *pLayer = m_pLayers; Layer *pLayer = m_pLayers;
while(pLayer) while(pLayer)
{ {
if (!pLayer->loadWeights(m_prjname)) if (!pLayer->loadWeights(m_name))
{ {
return false; return false;
} }
@@ -156,7 +156,7 @@ bool Stack::saveWeights()
Layer *pLayer = m_pLayers; Layer *pLayer = m_pLayers;
while(pLayer) while(pLayer)
{ {
if (!pLayer->saveWeights(m_prjname)) if (!pLayer->saveWeights(m_name))
{ {
return false; return false;
} }
@@ -191,7 +191,7 @@ void Stack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListe
if (pLayer) if (pLayer)
{ {
std::cout << m_prjname << ": " << " Training of layer " << std::to_string(layerId) << std::endl; std::cout << m_name << ": " << " Training of layer " << std::to_string(layerId) << std::endl;
pLayer->train(thisBatch, pListener); pLayer->train(thisBatch, pListener);
} }
} }
source/Stack.hpp
+2 -2
View File
@@ -23,7 +23,7 @@
class Stack class Stack
{ {
public: public:
Stack(const std::string &prjname); Stack(const std::string &name);
Stack(const Stack& orig); Stack(const Stack& orig);
virtual ~Stack(); virtual ~Stack();
@@ -46,7 +46,7 @@ public:
size_t numLayers(); size_t numLayers();
private: private:
const std::string &m_prjname; std::string m_name;
Layer *m_pLayers; Layer *m_pLayers;
}; };