diff --git a/source/Layer.hpp b/source/Layer.hpp index 9ae4fc6..33adf6f 100644 --- a/source/Layer.hpp +++ b/source/Layer.hpp @@ -58,7 +58,7 @@ public: return m_bh.n_elem; } private: - const std::string &m_name; + std::string m_name; std::string m_weightsFile; size_t m_id; size_t m_numVisibleX; diff --git a/source/Stack.cpp b/source/Stack.cpp index b8423f8..5c4928f 100644 --- a/source/Stack.cpp +++ b/source/Stack.cpp @@ -15,14 +15,14 @@ using namespace std; -Stack::Stack(const std::string &prjname) -: m_prjname(prjname) +Stack::Stack(const std::string &name) +: m_name(name) , m_pLayers(nullptr) { } Stack::Stack(const Stack& orig) -: m_prjname(orig.m_prjname) +: m_name(orig.m_name) , m_pLayers(orig.m_pLayers) { } @@ -78,8 +78,8 @@ Layer* Stack::getLayer(size_t layerId) const bool Stack::load() { - std::cout << "Importing Project " << m_prjname << std::endl; - ifstream ifs(m_prjname + string(".prj")); + std::cout << "Importing Project " << m_name << std::endl; + ifstream ifs(m_name + string(".prj")); Json::Reader reader; Json::Value project; @@ -106,12 +106,12 @@ bool Stack::load() bool Stack::save() { - std::cout << "Exporting Project " << m_prjname << std::endl; - ofstream ofs(m_prjname + string(".prj")); + std::cout << "Exporting Project " << m_name << std::endl; + ofstream ofs(m_name + string(".prj")); Json::StyledWriter writer; Json::Value project; - project["stack"]["name"] = m_prjname; + project["stack"]["name"] = m_name; Json::Value layers(Json::arrayValue); Layer *pLayer = m_pLayers; @@ -142,7 +142,7 @@ bool Stack::loadWeights() Layer *pLayer = m_pLayers; while(pLayer) { - if (!pLayer->loadWeights(m_prjname)) + if (!pLayer->loadWeights(m_name)) { return false; } @@ -156,7 +156,7 @@ bool Stack::saveWeights() Layer *pLayer = m_pLayers; while(pLayer) { - if (!pLayer->saveWeights(m_prjname)) + if (!pLayer->saveWeights(m_name)) { return false; } @@ -191,7 +191,7 @@ void Stack::train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListe 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); } } diff --git a/source/Stack.hpp b/source/Stack.hpp index 3d32ffd..4bf5159 100644 --- a/source/Stack.hpp +++ b/source/Stack.hpp @@ -23,7 +23,7 @@ class Stack { public: - Stack(const std::string &prjname); + Stack(const std::string &name); Stack(const Stack& orig); virtual ~Stack(); @@ -46,7 +46,7 @@ public: size_t numLayers(); private: - const std::string &m_prjname; + std::string m_name; Layer *m_pLayers; };