- added StackCreator
git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@823 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
+8
-8
@@ -21,13 +21,14 @@
|
||||
#include "Layer.hpp"
|
||||
#include <forward_list>
|
||||
|
||||
class AStack;
|
||||
class LayerConstructor
|
||||
{
|
||||
public:
|
||||
LayerConstructor() {}
|
||||
virtual ~LayerConstructor() {}
|
||||
|
||||
virtual Layer* onConstruct(const std::string &name, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden, size_t numContext)
|
||||
virtual Layer* onConstruct(AStack *pStack, const std::string &name, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden, size_t numContext)
|
||||
{
|
||||
return nullptr;
|
||||
}
|
||||
@@ -44,9 +45,10 @@ public:
|
||||
NUM_STACKTYPES
|
||||
};
|
||||
|
||||
const char *stackTypeStrings[NUM_STACKTYPES] = {"None", "Deep", "Rnn"};
|
||||
static const char *stackTypeStrings[NUM_STACKTYPES];
|
||||
|
||||
AStack(const std::string &dir, StackType type, const std::string &name);
|
||||
AStack(StackType type, const std::string &name);
|
||||
AStack(StackType type, const std::string &name, Json::Value &layers, LayerConstructor *pLayerConstructor=nullptr);
|
||||
AStack(const AStack& orig);
|
||||
virtual ~AStack();
|
||||
|
||||
@@ -58,12 +60,11 @@ public:
|
||||
|
||||
Layer* getLayer(size_t layerId) const;
|
||||
|
||||
bool load(LayerConstructor *pLayerConstructor=nullptr);
|
||||
bool save();
|
||||
bool save(const std::string &dir);
|
||||
|
||||
void weightsInit(double stddev);
|
||||
bool loadWeights();
|
||||
bool saveWeights();
|
||||
bool loadWeights(const std::string &dir);
|
||||
bool saveWeights(const std::string &dir);
|
||||
|
||||
virtual void train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener) = 0;
|
||||
virtual void train(const arma::mat& batch, Rbm::IListener* pListener) = 0;
|
||||
@@ -73,7 +74,6 @@ protected:
|
||||
StackType m_type;
|
||||
std::string m_name;
|
||||
Layer *m_pLayers;
|
||||
std::string m_dir;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user