Fixed #14

wagenaartje · May 10, 2017 · a64a36f · a64a36f
1 parent 34a731a
commit a64a36f
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 21 deletions.
diff --git a/dist/neataptic.js b/dist/neataptic.js
@@ -2004,17 +2004,26 @@ var Architect = {
       }
     }
 
-    // Calculate input and output size
-    for(var node in nodes){
-      if(nodes[node].connections.out.length + nodes[node].connections.gated.length == 0){
-        nodes[node].type = 'output';
+    // Determine input and output nodes
+    var inputs = [];
+    var outputs = [];
+    for(var i = nodes.length - 1; i >= 0; i--){
+      if(nodes[i].connections.out.length + nodes[i].connections.gated.length == 0){
+        nodes[i].type = 'output';
         network.output++;
-      } else if(!nodes[node].connections.in.length){
-        nodes[node].type = 'input';
+        outputs.push(nodes[i]);
+        nodes.splice(i, 1);
+      } else if(!nodes[i].connections.in.length){
+        nodes[i].type = 'input';
         network.input++;
+        inputs.push(nodes[i]);
+        nodes.splice(i, 1);
       }
     }
 
+    // Input nodes are always first, output nodes are always last
+    nodes = inputs.concat(nodes).concat(outputs);
+
     if(network.input == 0 || network.output == 0){
       throw new Error('Given nodes have no clear input/output node!');
     }

diff --git a/dist/neataptic.min.js b/dist/neataptic.min.js
diff --git a/docs/cdn/neataptic.js b/docs/cdn/neataptic.js
@@ -2004,17 +2004,26 @@ var Architect = {
       }
     }
 
-    // Calculate input and output size
-    for(var node in nodes){
-      if(nodes[node].connections.out.length + nodes[node].connections.gated.length == 0){
-        nodes[node].type = 'output';
+    // Determine input and output nodes
+    var inputs = [];
+    var outputs = [];
+    for(var i = nodes.length - 1; i >= 0; i--){
+      if(nodes[i].connections.out.length + nodes[i].connections.gated.length == 0){
+        nodes[i].type = 'output';
         network.output++;
-      } else if(!nodes[node].connections.in.length){
-        nodes[node].type = 'input';
+        outputs.push(nodes[i]);
+        nodes.splice(i, 1);
+      } else if(!nodes[i].connections.in.length){
+        nodes[i].type = 'input';
         network.input++;
+        inputs.push(nodes[i]);
+        nodes.splice(i, 1);
       }
     }
 
+    // Input nodes are always first, output nodes are always last
+    nodes = inputs.concat(nodes).concat(outputs);
+
     if(network.input == 0 || network.output == 0){
       throw new Error('Given nodes have no clear input/output node!');
     }

diff --git a/docs/cdn/neataptic.min.js b/docs/cdn/neataptic.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "neataptic",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Architecture-free neural network library with genetic algorithm implementations",
   "main": "./src/neataptic",
   "scripts": {

diff --git a/src/architect.js b/src/architect.js
@@ -32,17 +32,26 @@ var Architect = {
       }
     }
 
-    // Calculate input and output size
-    for(var node in nodes){
-      if(nodes[node].connections.out.length + nodes[node].connections.gated.length == 0){
-        nodes[node].type = 'output';
+    // Determine input and output nodes
+    var inputs = [];
+    var outputs = [];
+    for(var i = nodes.length - 1; i >= 0; i--){
+      if(nodes[i].connections.out.length + nodes[i].connections.gated.length == 0){
+        nodes[i].type = 'output';
         network.output++;
-      } else if(!nodes[node].connections.in.length){
-        nodes[node].type = 'input';
+        outputs.push(nodes[i]);
+        nodes.splice(i, 1);
+      } else if(!nodes[i].connections.in.length){
+        nodes[i].type = 'input';
         network.input++;
+        inputs.push(nodes[i]);
+        nodes.splice(i, 1);
       }
     }
 
+    // Input nodes are always first, output nodes are always last
+    nodes = inputs.concat(nodes).concat(outputs);
+
     if(network.input == 0 || network.output == 0){
       throw new Error('Given nodes have no clear input/output node!');
     }