From 70ec00285128f8f9f5fa0e848950212e6a235d43 Mon Sep 17 00:00:00 2001
From: Justin Worthe <justin.worthe@gmail.com>
Date: Fri, 14 Aug 2015 22:12:56 +0200
Subject: Added missing sensors

---
 include/brain/neural_network.h | 4 ++--
 include/brain/neural_node.h    | 1 -
 include/brain/neuron.h         | 4 ++--
 3 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'include/brain')

diff --git a/include/brain/neural_network.h b/include/brain/neural_network.h
index 22e5e42..f75fdea 100644
--- a/include/brain/neural_network.h
+++ b/include/brain/neural_network.h
@@ -26,8 +26,8 @@ public:
 private:
     std::map<int, std::shared_ptr<Sensor>> _sensors;
     std::shared_ptr<BiasNode> _biasNode;
-    std::map<int, std::shared_ptr<Neuron>> _hiddenNodes;
-    std::map<int, std::shared_ptr<Neuron>> _outputs;
+    std::map<int, std::shared_ptr<Neuron>> _neurons;
+    std::vector<std::shared_ptr<Neuron>> _outputs;
 
     void parseFile(std::istream &&file);
     
diff --git a/include/brain/neural_node.h b/include/brain/neural_node.h
index 3c2a6cb..c7b4335 100644
--- a/include/brain/neural_node.h
+++ b/include/brain/neural_node.h
@@ -4,7 +4,6 @@ class NeuralNode
 {
 public:
     NeuralNode(char type, int id);
-    virtual ~NeuralNode() {};
 	
     virtual double activation() const = 0;
     
diff --git a/include/brain/neuron.h b/include/brain/neuron.h
index 810ce5b..d017b0d 100644
--- a/include/brain/neuron.h
+++ b/include/brain/neuron.h
@@ -13,9 +13,9 @@ public:
     virtual ~Neuron() {}
     virtual double activation() const;
 
-    void addInput(std::shared_ptr<NeuralLink> link);
+    void addInput(std::unique_ptr<NeuralLink>&& link);
 
 private:
-    std::vector<std::shared_ptr<NeuralLink>> _inputLinks;
+    std::vector<std::unique_ptr<NeuralLink>> _inputLinks;
     double sigmoid(double input) const;
 };
-- 
cgit v1.2.3