Merge pull request #100 from ci-group/fix-multineat-nn-depth

Fix multineat nn depth bug
ci-group · Jun 19, 2020 · ecdc525 · ecdc525
2 parents 3af3444 + 585b440
commit ecdc525
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cpprevolve/revolve/brains/controller/DifferentialCPG.cpp b/cpprevolve/revolve/brains/controller/DifferentialCPG.cpp
@@ -95,6 +95,7 @@ DifferentialCPG::DifferentialCPG(
     // build the NN according to the genome
     NEAT::NeuralNetwork net;
     gen.BuildPhenotype(net);
+    unsigned int net_depth = net.CalculateNetworkDepth();
 
     // get weights for each connection
     // assuming that connections are distinct for each direction
@@ -112,7 +113,9 @@ DifferentialCPG::DifferentialCPG(
         inputs[7] = -1;
 
         net.Input(inputs);
-        net.Activate();
+        for (unsigned int i=0; i<net_depth; i++) {
+            net.Activate();
+        }
         double weight = net.Output()[0];
 #ifdef DifferentialCPG_PRINT_INFO
         std::cout << "Creating weight ["
@@ -129,7 +132,9 @@ DifferentialCPG::DifferentialCPG(
         // convert tuple to vector
         std::tie(inputs[0], inputs[1], inputs[2], inputs[3], inputs[4], inputs[5], inputs[6], inputs[7]) = con.first;
         net.Input(inputs);
-        net.Activate();
+        for (unsigned int i=0; i<net_depth; i++) {
+            net.Activate();
+        }
         double weight = net.Output()[0];
 #ifdef DifferentialCPG_PRINT_INFO
         std::cout << "Creating weight ["

diff --git a/thirdparty/MultiNEAT b/thirdparty/MultiNEAT
+17 −2		src/Genome.cpp
+7 −0		src/Genome.h
+7 −0		src/Parameters.cpp
+2 −0		src/Parameters.h
+1 −0		src/Population.cpp
+1 −1		src/PythonBindings.cpp
+1 −0		src/Species.cpp