5 files changed, 21 insertions, 5 deletions
diff --git a/include/brain/neural_link.h b/include/brain/neural_link.h
index 42ee2f9..5a63ba4 100644
--- a/include/brain/neural_link.h
+++ b/include/brain/neural_link.h
@@ -7,7 +7,7 @@
 class NeuralLink
 {
 public:
-    NeuralLink(double weight);
+    NeuralLink(std::shared_ptr<NeuralNode> input, double weight);
     double weightedActivation() const;
     
 private:
diff --git a/include/brain/neural_network.h b/include/brain/neural_network.h
index 308cb56..b2c441f 100644
--- a/include/brain/neural_network.h
+++ b/include/brain/neural_network.h
@@ -3,9 +3,12 @@
 #include <memory>
 #include <istream>
 #include <vector>
+#include <string>
 
 #include "brain/neural_node.h"
 #include "brain/sensor.h"
+#include "brain/bias_node.h"
+#include "brain/neuron.h"
 
 class NeuralNetwork
 {
@@ -19,8 +22,15 @@ public:
     int numberOfOutputs() const { return _outputs.size(); }
 	
 private:
-    std::vector<std::shared_ptr<NeuralNode>> _nodes;
     std::vector<std::shared_ptr<Sensor>> _sensors;
-    std::vector<std::shared_ptr<NeuralNode>> _outputs;
+    std::shared_ptr<BiasNode> _biasNode;
+    std::vector<std::shared_ptr<Neuron>> _hiddenNodes;
+    std::vector<std::shared_ptr<Neuron>> _outputs;
+
+    void parseFile(std::istream &&file);
+    
+    void addLink(std::shared_ptr<NeuralNode> source, std::shared_ptr<Neuron> destination, double weight);
+    std::shared_ptr<Sensor> findOrAddSensor(int id);
+    std::shared_ptr<Neuron> findOrAddNeuron(int id);
 };
 
diff --git a/include/brain/neuron.h b/include/brain/neuron.h
index 1607cf0..810ce5b 100644
--- a/include/brain/neuron.h
+++ b/include/brain/neuron.h
@@ -13,6 +13,8 @@ public:
     virtual ~Neuron() {}
     virtual double activation() const;
 
+    void addInput(std::shared_ptr<NeuralLink> link);
+
 private:
     std::vector<std::shared_ptr<NeuralLink>> _inputLinks;
     double sigmoid(double input) const;
diff --git a/include/game_state.h b/include/game_state.h
index 905bbc9..482dd7d 100644
--- a/include/game_state.h
+++ b/include/game_state.h
@@ -20,6 +20,8 @@ public:
     const std::vector<PlayerMissile>& missiles() const { return _missiles; }
     const std::vector<Shield>& shields() const { return _shields; }
     const std::vector<Spaceship>& spaceships() const { return _spaceships; }
+
+    std::vector<bool> toBitArray() const;
     
 private:
     std::vector<Alien> _aliens;
diff --git a/include/spacebot.h b/include/spacebot.h
index 9b89383..079b33e 100644
--- a/include/spacebot.h
+++ b/include/spacebot.h
@@ -9,8 +9,10 @@ public:
     Spacebot(std::string outputPath);
     void writeNextMove();
 private:
-    std::string outputFilename;
-    GameState gameState;
+    std::string _outputFilename;
+    std::string _networkConfigFilename;
+    GameState _gameState;
+    
     void writeMove(const Move& move);
     Move chooseMove();
 };