removing unused classes and attributes

This commit is contained in:
2015-08-30 23:19:11 +02:00
parent 3d2970217f
commit 1a4b438a99
3 changed files with 7 additions and 36 deletions

View File

@@ -32,7 +32,7 @@ LayerNetworkNeuron& LayerNetworkLayer::operator[](const size_t& neuron)
}
LayerNetwork::LayerNetwork(std::initializer_list<size_t> s, double lam, LayerNetworkInitializer weightInit): ACyclicNetwork(lam),layers(s.size())
LayerNetwork::LayerNetwork(std::initializer_list<size_t> s, double lam, LayerNetworkInitializer weightInit): Network(),layers(s.size())
{
transfer = new ActivationFunction::ActivationFunction*[s.size()];
weights= new float**[s.size()];

View File

@@ -4,10 +4,7 @@
#include "Network.h"
#include "ActivationFunction/Sigmoid.h"
#include "ActivationFunction/ActivationFunction.h"
#include "BasisFunction/BasisFunction.h"
#include "BasisFunction/StreamingBasisFunction.h"
#include "BasisFunction/FeedForward.h"
#include <vector>
@@ -93,7 +90,7 @@ namespace NeuralNetwork
* Shin::Solution sol = net.solve(Shin::Problem(0.1)) // and finaly, solve Problem
* @endcode
*/
class LayerNetwork:public ACyclicNetwork
class LayerNetwork:public Network
{
public:
/**
@@ -120,8 +117,11 @@ namespace NeuralNetwork
/**
* @brief computes output Solution from input Problem
*/
virtual size_t size() const { return layers; };
virtual Shin::Solution solve(const Shin::Problem& p) override;
virtual size_t size() const override { return layers;};
virtual LayerNetworkLayer& operator[](const size_t& l) override;
protected:
void solvePart(float *newSolution, size_t begin, size_t end,size_t prevSize, float* sol,size_t layer);

View File

@@ -49,7 +49,7 @@ namespace NeuralNetwork
* @brief Constructor for Network
* @param lam is parametr for many TransferFunctions
*/
inline Network(double lam):lambda(lam) {};
inline Network() {};
/**
* @brief Virtual destructor for Network
@@ -85,40 +85,11 @@ namespace NeuralNetwork
protected:
/**
* @brief Parametr for TransferFunctions
*/
float lambda;
/**
* @brief Number of threads used by network
*/
unsigned threads=1;
};
/**
* @author Tomas Cernik (Tom.Cernik@gmail.com)
* @brief Abstract class for all Acyclic networks
*/
class ACyclicNetwork : public Network
{
public:
/**
* @brief Constructor for Acyclic network
* @param lam is parametr for many TransferFunctions
*/
inline ACyclicNetwork(double lam):Network(lam) {};
/**
* @brief Returns size of ANN in layer
* @returns Return number of layer in network
*/
virtual size_t size() const=0;
protected:
private:
};
}
#endif