added feedForward and moving Reccurent neuron to normal

This commit is contained in:
2016-01-28 22:17:36 +01:00
parent 13b179dd57
commit 3e383e9add
12 changed files with 265 additions and 252 deletions

View File

@@ -1,7 +1,6 @@
#pragma once
#include "../Network.h"
#include "Neuron.h"
#include <vector>
@@ -67,7 +66,7 @@ namespace Recurrent {
*/
std::vector<float> computeOutput(const std::vector<float>& input, unsigned int iterations);
std::vector<NeuralNetwork::Neuron*>& getNeurons () {
std::vector<NeuronInterface*>& getNeurons () {
return neurons;
}
@@ -75,10 +74,10 @@ namespace Recurrent {
void stringify(std::ostream& out) const override;
NeuralNetwork::Neuron& addNeuron() {
neurons.push_back(new Recurrent::Neuron(neurons.size()));
NeuralNetwork::Neuron *newNeuron=neurons.back();
for(size_t i=0;i<neurons.size();i++) {
NeuronInterface& addNeuron() {
neurons.push_back(new Neuron(neurons.size()));
NeuronInterface *newNeuron=neurons.back();
for(std::size_t i=0;i<neurons.size();i++) {
neurons[i]->setWeight(*newNeuron,0.0);
}
return *newNeuron;
@@ -95,7 +94,7 @@ namespace Recurrent {
size_t inputSize=0;
size_t outputSize=0;
std::vector<NeuralNetwork::Neuron*> neurons;
std::vector<NeuronInterface*> neurons;
};
}
}