[RBM]

- Layer is an Rbm

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@581 b431acfa-c32f-4a4a-93f1-934dc6c82436

source/Layer.hpp

@@ -21,18 +21,17 @@
 #include "Rbm.hpp"
 #include "ILayer.hpp"
 
-class Layer
+class Layer : public Rbm
 {
 public:
 	Layer *upper;
 	Layer *lower;
 
-	Layer(const std::string &prjname, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden);
+	Layer(const std::string &prjname, size_t id, size_t numVisibleX, size_t numVisibleY, size_t numHidden, const Rbm::Params &params);
 	Layer(const Layer& orig);
 	virtual ~Layer();
 
 	Json::Value toJson() const;
-	Rbm& rbm();
 	void saveWeights();
 
 	arma::mat up_pass(const arma::mat& hidden);
@@ -49,8 +48,7 @@ private:
 	size_t m_id;
 	size_t m_numVisibleX;
 	size_t m_numVisibleY;
-	Rbm::Params m_rbm_params;
-	Rbm m_rbm;
+	const Rbm::Params &m_rbm_params;
 
 };