- refactored

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@818 b431acfa-c32f-4a4a-93f1-934dc6c82436
2022-01-17 15:03:50 +00:00
parent a372f1a30d
commit bd88074994
8 changed files with 100 additions and 59 deletions
@@ -19,6 +19,7 @@
 #include <armadillo>
 #include <jsoncpp/json/json.h>
 #include "Layer.hpp"
+#include <forward_list>

 class LayerConstructor
 {
@@ -63,16 +64,18 @@ public:
 	bool loadWeights();
 	bool saveWeights();

-    arma::mat upPass(size_t layerId, arma::mat const &v);
-    arma::mat downPass(size_t layerId, arma::mat const &h);
-    arma::mat upDownPass(size_t layerId, arma::mat const &v);
-
+	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;
+	arma::mat trainingBatchFrom(size_t layerId, const arma::mat& batch);	
+	
 protected:
 	StackType m_type;
 	std::string m_name;
 	Layer *m_pLayers;
 	std::string m_dir;

+private:
+	
 };

 #endif /* ASTACK_HPP */