Dumping results as option

templates/js/socket.js

@@ -21,27 +21,27 @@ ws.onmessage = function(message) {
             break;
 
         case 'get_trial':
-            console.log(msg['data']);
-            GraphVisualization.import(convertJSON(msg['data']['graph']), msg['data']['models'], function() {
+            //console.log(msg['data']);
+            GraphVisualization.import(convertJSON(msg['data']), function() {
                 $('#load').hide();
                 reset_configuration();
                 set_configuration();
                 $('#home_menu').click(function() {
                     setTimeout(function() {
                         reset_timeline();
-                        set_timeline(msg['data']['graph']);
+                        set_timeline(msg['data']);
                     }, 1000);
                 });
                 reset_timeline();
-                set_timeline(msg['data']['graph']);
+                set_timeline(msg['data']);
             });
             $('#charts .chart').removeClass('no-data');
-            set_chart_nodes(msg['data']['graph'], chart_nodes)
-            set_chart_attrs(msg['data']['graph'], chart_attrs, $('.config-item #properties').val())
+            set_chart_nodes(msg['data'], chart_nodes)
+            set_chart_attrs(msg['data'], chart_attrs, $('.config-item #properties').val())
             $('.config-item #properties').change(function() {
                 chart_attrs.destroy();
                 chart_attrs = create_chart(width_chart, height_chart, 'Time', 'Attributes', '#chart_attrs');
-                set_chart_attrs(msg['data']['graph'], chart_attrs, $('.config-item #properties').val())
+                set_chart_attrs(msg['data'], chart_attrs, $('.config-item #properties').val())
             });
             break;
 

templates/js/template.js

@@ -82,7 +82,7 @@ var initGUI = function(model_params) {
                 addSliderInput(model_params[option]['label'], model_params[option]['value']);
                 break;
             default:
-                console.log('Input type not defined!');
+                console.log(model_params[option]['type'] + ' not defined!');
                 break;
         }
     }

templates/js/visualization.js

@@ -13,7 +13,8 @@
 
   // Private constants
   var focus_opacity = 0.1,
-      radius = 8;
+      radius = 8,
+      required_node = ['id', 'index', 'label', 'px', 'py', 'spells', 'weight', 'x', 'y'];
 
   // Private variables
   var width,
@@ -43,6 +44,13 @@
     return ( this > min && this <= max ) || ( min === 0 && this === 0 );
   };
 
+  Number.prototype.type = function() {
+    if ( typeof(this) === 'number' )
+      return ( Number.isInteger(this) ) ? 'int' :  'float';
+    else 
+      return false;
+  }
+
   var lastFocusNode;
   var _helpers = {
     set_node: function(node, property, time) {
@@ -118,7 +126,14 @@
       link.style('opacity', function(o) {
           return o.source.index == d.index || o.target.index == d.index ? 1 : focus_opacity;
       });
+    },
+    push_once: function(array, item, key) {
+    for (var i in array) {
+      if ( array[i][key] == item[key] ) return false;
     }
+    array.push(item);
+    return true;
+  }
   }
 
 
@@ -253,6 +268,22 @@
     self.GraphVisualization.statistics = statistics
   }
 
+  function get_models(graph) {
+
+    var models = { 'dynamic': [], 'static': [] }
+
+    graph['nodes'].forEach(function(node) {
+      for ( var att in node ) {
+        if (!required_node.includes(att)) {
+          if ( Array.isArray(node[att]) ) _helpers.push_once(models['dynamic'], { 'title': att, 'type': node[att][0][0].type() }, 'title');
+          else _helpers.push_once(models['static'], { 'title': att, 'type': typeof(node[att]) }, 'title');
+        }
+      }
+    });
+
+    return models;
+  }
+
 
   /**
    * Public API
@@ -287,24 +318,21 @@
    * A function that imports the graph and the attributes of all the nodes.
    *
    * @param   {object}    json          The json structure of the graph.
-   * @param   {object}    attributes    Definition of the attributes of the nodes 
-   *                                    (statics and dynamics).
    * @param   {object}    callback      A function called at the end.
    */
-  function importJSON(json, attributes, callback) {
+  function importJSON(json, callback) {
     reset()
     graph = json;
-    model = attributes;
 
     // Create the graph itself
     Graph();
 
     self.GraphVisualization.nodes = graph.nodes.length;
     self.GraphVisualization.links = graph.links.length;
-    self.GraphVisualization.model = model;
+    self.GraphVisualization.model = get_models(json);
 
     // Draw graph with default property and time for the first time
-    update_data(model.dynamic[0].title, 0);
+    update_data(self.GraphVisualization.model.dynamic[0].title, 0);
 
     if (callback) { callback(); }
   }