- moved method of layer interaction from Layer to Stack

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

source/Layer.hpp

@@ -33,16 +33,15 @@ public:
     Json::Value toJson() const;
 
     size_t id();
+	bool isEnable();
+	void setEnable(bool enable);
+	
     std::string& name();
     int numVisibleX();
     int numVisibleY();
     const arma::mat& context() const;
 
     Layer *root();
-    arma::mat gibbsPass(arma::mat &vr);
-    arma::mat upPass(arma::mat const &v);
-    arma::mat downPass(arma::mat const &h);
-    arma::mat upDownPass(arma::mat const &v);
     arma::mat vc_to_v(const arma::mat &vc) const;
     arma::mat vc_to_c(const arma::mat &vc) const;
 
@@ -53,10 +52,14 @@ public:
     arma::mat trainingData(arma::mat const &batch);
     void train(arma::mat const &batch, IListener *pListener=nullptr);
 	
+	arma::mat to_h_gibbs(const arma::mat& v_probs);
+	arma::mat to_v_gibbs(const arma::mat& h_probs);
+
 private:
 	
     std::string m_name;
     size_t m_id;
+	bool m_isEnabled;
     size_t m_numVisibleX;
     size_t m_numVisibleY;
     size_t m_numContext;
@@ -65,6 +68,10 @@ private:
     // Compatibility
     std::string filePrefix(const std::string &dir, const std::string &prjname) const;
 
+protected:
+	virtual void onUpPass(const arma::mat& v) {}
+	virtual void onDownPass(const arma::mat& h) {}
+
 };
 
 #endif /* RBMLAYER_HPP */