Updated GenArch for custom layers. Fixes #157

WIP #157 Updated 'standalone' default to true

WIP #157 Fixed code-climate issues

src/plugins/GenerateArchitecture/GenerateArchitecture.js

@@ -43,33 +43,47 @@ define([
     GenerateArchitecture.prototype.constructor = GenerateArchitecture;
 
     GenerateArchitecture.prototype.main = function () {
+        this.addCustomLayersToMeta();
         this.LayerDict = createLayerDict(this.core, this.META);
         this.uniqueId = 2;
         this._oldTemplateSettings = _.templateSettings;
         return PluginBase.prototype.main.apply(this, arguments);
     };
 
+    GenerateArchitecture.prototype.addCustomLayersToMeta = function () {
+        var metaDict = this.core.getAllMetaNodes(this.rootNode);
+
+        Object.keys(metaDict).map(id => metaDict[id])
+            // Get all custom layers
+            .filter(node => this.core.isTypeOf(node, this.META.Layer))
+            // Add them to the meta
+            .forEach(node => this.META[this.core.getAttribute(node, 'name')] = node);
+    };
+
     GenerateArchitecture.prototype.createOutputFiles = function (tree) {
         var layers = tree[Constants.CHILDREN],
             //initialLayers,
             result = {},
-            code;
+            code = 'require \'nn\'\n\n';
 
         //initialLayers = layers.filter(layer => layer[Constants.PREV].length === 0);
         // Add an index to each layer
         layers.forEach((l, index) => l[INDEX] = index);
-        code = this.genArchCode(layers);
+
+        // Define custom layers
+        if (this.getCurrentConfig().standalone) {
+            code += this.genLayerDefinitions(layers);
+        }
+
+        code += this.genArchCode(layers);
 
         result[tree.name + '.lua'] = code;
         _.templateSettings = this._oldTemplateSettings;  // FIXME: Fix this in SimpleNodes
         return result;
     };
 
     GenerateArchitecture.prototype.genArchCode = function (layers) {
-        // Create a 'null' start layer
-
         return [
-            'require \'nn\'',
             this.createSequential(layers[0], 'net').code,
             '\nreturn net'
         ].join('\n');
@@ -174,5 +188,22 @@ define([
         return !(value === undefined || value === null || value === '');
     };
 
+    GenerateArchitecture.prototype.genLayerDefinitions = function(layers) {
+        var code = '',
+            customLayerId = this.core.getPath(this.META.CustomLayer);
+
+        code += '-------------- Custom Layer Definitions --------------\n\n';
+        code += layers
+            .filter(layer => {  // Get the custom layers
+                var node = this.META[layer.name];
+                return this.core.getMixinPaths(node).indexOf(customLayerId) !== -1;
+            })
+            .map(layer => layer.code)  // add their 'code' attributes
+            .join('\n');
+
+        code += '\n\n-------------- Network --------------\n';
+
+        return code;
+    };
     return GenerateArchitecture;
 });

src/plugins/GenerateArchitecture/metadata.json

@@ -9,5 +9,14 @@
   },
   "disableServerSideExecution": false,
   "disableBrowserSideExecution": false,
-  "configStructure": []
+  "configStructure": [
+      {
+            "name": "standalone",
+            "displayName": "Standalone",
+            "description": "Prepend custom layer definitions",
+            "value": true,
+            "valueType": "boolean",
+            "readOnly": false
+      }
+  ]
 }

src/visualizers/panels/ForgeActionButton/ForgeActionButton.js

@@ -167,7 +167,6 @@ define([
 
         // Set the color
         desc.color = '#9e9e9e';
-        // TODO
         return desc;
     };
 

src/visualizers/panels/LayerEditor/LayerEditorPanel.js

@@ -1,20 +1,15 @@
 /*globals define, _, WebGMEGlobal*/
 /*jshint browser: true*/
-/**
- * Generated by VisualizerGenerator 1.7.0 from webgme on Thu Jun 16 2016 08:47:07 GMT-0500 (CDT).
- */
 
 define([
     'js/PanelBase/PanelBaseWithHeader',
     'js/PanelManager/IActivePanel',
     'widgets/TextEditor/TextEditorWidget',
-    //'panels/TextEditor/TextEditorControl'
     './LayerEditorControl'
 ], function (
     PanelBaseWithHeader,
     IActivePanel,
-    LayerEditorWidget,
-    //TextEditorControl
+    TextEditorWidget,
     LayerEditorControl
 ) {
     'use strict';
@@ -49,7 +44,7 @@ define([
         //set Widget title
         this.setTitle('');
 
-        this.widget = new LayerEditorWidget(this.logger, this.$el);
+        this.widget = new TextEditorWidget(this.logger, this.$el);
 
         this.widget.setTitle = function (title) {
             self.setTitle(title);