- handle full path names
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@661 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+11
-9
@@ -15,14 +15,16 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
Stack::Stack(const std::string &name)
|
||||
: m_name(name)
|
||||
Stack::Stack(const std::string &dir, const std::string &name)
|
||||
: m_dir(dir)
|
||||
, m_name(name)
|
||||
, m_pLayers(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
Stack::Stack(const Stack& orig)
|
||||
: m_name(orig.m_name)
|
||||
: m_dir(orig.m_dir)
|
||||
, m_name(orig.m_name)
|
||||
, m_pLayers(orig.m_pLayers)
|
||||
{
|
||||
}
|
||||
@@ -92,7 +94,7 @@ Layer* Stack::getLayer(size_t layerId) const
|
||||
bool Stack::load(LayerConstructor *pLayerConstructor)
|
||||
{
|
||||
std::cout << "Importing Project " << m_name << std::endl;
|
||||
ifstream ifs(m_name + string(".prj"));
|
||||
ifstream ifs(m_dir + "/" + m_name + string(".prj"));
|
||||
|
||||
Json::Reader reader;
|
||||
Json::Value project;
|
||||
@@ -132,7 +134,7 @@ bool Stack::load(LayerConstructor *pLayerConstructor)
|
||||
bool Stack::save()
|
||||
{
|
||||
std::cout << "Exporting Project " << m_name << std::endl;
|
||||
ofstream ofs(m_name + string(".prj"));
|
||||
ofstream ofs(m_dir + "/" + m_name + string(".prj"));
|
||||
|
||||
Json::StyledWriter writer;
|
||||
Json::Value project;
|
||||
@@ -167,7 +169,7 @@ bool Stack::loadWeights()
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (!pLayer->loadWeights(m_name))
|
||||
if (!pLayer->loadWeights(m_dir + "/" + m_name))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -181,7 +183,7 @@ bool Stack::saveWeights()
|
||||
Layer *pLayer = m_pLayers;
|
||||
while(pLayer)
|
||||
{
|
||||
if (!pLayer->saveWeights(m_name))
|
||||
if (!pLayer->saveWeights(m_dir + "/" + m_name))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@@ -227,7 +229,7 @@ size_t Stack::loadTraining(bool doNormalize)
|
||||
uint32_t numTraining = 0;
|
||||
uint32_t numVisible = 0;
|
||||
|
||||
std::string filename = m_name + ".training.dat";
|
||||
std::string filename = m_dir + "/" + m_name + ".training.dat";
|
||||
FILE *pFile = fopen(filename.c_str(), "r");
|
||||
|
||||
if (!pFile)
|
||||
@@ -273,7 +275,7 @@ size_t Stack::loadTraining(bool doNormalize)
|
||||
|
||||
size_t Stack::saveTraining()
|
||||
{
|
||||
std::string filename = m_name + ".training.dat";
|
||||
std::string filename = m_dir + "/" + m_name + ".training.dat";
|
||||
FILE *pFile = fopen(filename.c_str(), "w");
|
||||
|
||||
if (!pFile)
|
||||
|
||||
Reference in New Issue
Block a user