From 370fdd7bbb32cb99355dce53980e798d442c30b6 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 17 Jan 2022 15:14:55 +0000
Subject: [PATCH] - refactored

git-svn-id: http://moon:8086/svn/software/trunk/projects/Rbm@820 b431acfa-c32f-4a4a-93f1-934dc6c82436
---
 source/AStack.cpp    |  5 +++++
 source/AStack.hpp    |  1 +
 source/DeepStack.hpp | 13 ++++++-------
 source/Layer.hpp     |  1 -
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/source/AStack.cpp b/source/AStack.cpp
index 8a5448c..f8a3a7e 100644
--- a/source/AStack.cpp
+++ b/source/AStack.cpp
@@ -39,6 +39,11 @@ AStack::~AStack()
 	}
 }
 
+AStack::StackType AStack::type()
+{
+	return m_type;
+}
+
 void AStack::setName(const std::string& name)
 {
 	m_name = name;
diff --git a/source/AStack.hpp b/source/AStack.hpp
index 259308f..d31cc9c 100644
--- a/source/AStack.hpp
+++ b/source/AStack.hpp
@@ -50,6 +50,7 @@ public:
 	AStack(const AStack& orig);
 	virtual ~AStack();
 	
+	StackType type();
 	void setName(const std::string &name);
 	size_t numLayers();
 	void addLayer(Layer *pLayer);
diff --git a/source/DeepStack.hpp b/source/DeepStack.hpp
index 1306da3..bceca7d 100644
--- a/source/DeepStack.hpp
+++ b/source/DeepStack.hpp
@@ -29,7 +29,13 @@ public:
 	virtual ~DeepStack();
 	
 	void train(Rbm::IListener* pListener);
+	void train(const arma::mat& batch, Rbm::IListener* pListener) override;
+	void train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener) override;
 	
+    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);
+
 	size_t numTraining();
 	void addTraining(const arma::mat &toAdd);
 	void delTraining(int index);
@@ -38,13 +44,6 @@ public:
 	arma::mat& trainingBatch();
 	arma::mat trainingBatch(Layer *pLayer);
 
-    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);
-
-	void train(const arma::mat& batch, Rbm::IListener* pListener) override;
-	void train(size_t layerId, const arma::mat& batch, Rbm::IListener* pListener) override;
-
 private:
 	arma::mat m_trainingBatch;
 };
diff --git a/source/Layer.hpp b/source/Layer.hpp
index 2796774..db7d178 100644
--- a/source/Layer.hpp
+++ b/source/Layer.hpp
@@ -49,7 +49,6 @@ public:
     bool weightsSave(std::string const &dir, std::string const &prj);
 
     void calcContextBatch(arma::mat &batch);
-    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);