Reading brain in from a file

1 files changed, 4 insertions, 9 deletions

diff --git a/src/spacebot.cpp b/src/spacebot.cpp
index 1f8f2b8..418756c 100644
--- a/src/spacebot.cpp
+++ b/src/spacebot.cpp
@@ -3,9 +3,9 @@
 #include "brain/neural_network.h"
 #include <fstream>
 
-Spacebot::Spacebot(std::string outputPath)
+Spacebot::Spacebot(std::string outputPath, std::string brainFilename)
     : _outputFilename(outputPath+"/move.txt"),
-      _networkConfigFilename("brain.nn"),
+      _brainFilename(brainFilename),
       _gameState(std::ifstream(outputPath+"/map.txt"))
 {
 }
@@ -20,15 +20,10 @@ Move Spacebot::chooseMove()
 {
     auto sensorInputs = _gameState.toBitArray();
     
-    NeuralNetwork network(std::ifstream(_networkConfigFilename),
-			  sensorInputs.size(),
+    NeuralNetwork network(std::ifstream(_brainFilename),
+			  sensorInputs,
 			  static_cast<int>(Move::BUILD_SHIELD));
 
-    for (int i=0; i<sensorInputs.size(); ++i)
-    {
-	network.setInput(i, sensorInputs[i] ? 1 : 0);
-    }
-
     int moveInt = network.findMaxOutputIndex();
     return static_cast<Move>(moveInt);
 }