Added weighting and writing weighted multiline adjlists.

Author: Jabbath

package.json

@@ -1,6 +1,6 @@
 {
     "name": "graph-creator",
-    "version": "0.4.3",
+    "version": "0.6.4",
     "main": "index.html",
     "window": {
         "height": 1024,

src/creator.js

@@ -1,3 +1,51 @@
+//********************************************************************
+//Adding Weights and Labels
+//********************************************************************
+var selectedEdge,
+    writingEdge = false;
+
+function writeWeight(evt){
+    //Enable writing weights for edges
+    selectedEdge = evt.target;
+    writingEdge = true;
+}
+
+
+function stopWriteWeight(evt){
+    //Disable writing weights after the user takes his mouse off an edge
+    writingEdge = false;
+}
+
+$(document).on('keypress', function(key){ 
+    /*
+    Listen for when we press a key and change a edge's weight if
+    we are hovering over it.
+
+    INPUT
+    key: A jquery keyup event
+    */
+    
+    if(!writingEdge) return;
+
+    //Enter only numbers
+    if(key.keyCode >= 48 && key.keyCode <= 57){
+        selectedEdge.style('label',
+        selectedEdge.style('label') + String.fromCharCode(key.keyCode).toLowerCase());
+    }
+});
+
+$(document).on('keyup', function(key){
+    if(!writingEdge) return;
+
+    if(key.keyCode === 8){
+        //Check if our weight is empty
+        if(selectedEdge.style('label').length === 0) return;
+            
+        //Remove the last character
+        selectedEdge.style('label', selectedEdge.style('label').slice(0, -1));
+    }
+});
+
 var selectedNode,
     writing = false;
 
@@ -61,7 +109,8 @@ function addEdge(evt){
             group: 'edges',
             data: {
                 source: selected[0].id(),
-                target: selected[1].id()
+                target: selected[1].id(),
+                weight: 1
             }
         });
 

src/cytoInit.js

@@ -12,7 +12,8 @@ function renderGraph(img){
                 'line-color': '#3399ff',
                 'opacity': 0.7,
                 'curve-style': 'bezier',
-                'control-point-step-size': '50px'
+                'control-point-step-size': '50px',
+                'label': ''
             }
         },
         {
@@ -45,5 +46,8 @@ function renderGraph(img){
 
     cy.on('mouseover', 'node', writeLabel);
     cy.on('mouseout', 'node', stopWrite);
+
+    cy.on('mouseover', 'edge', writeWeight);
+    cy.on('mouseout', 'edge', stopWriteWeight);
 }
 

src/fileWrite.js

@@ -7,6 +7,27 @@ var fs = require('fs'),
 //**************************************************************************
 //WRITE GRAPHS
 //**************************************************************************
+function checkWeighted(){
+    /*
+    Goes through each edge in the graph and checks if weight is defined.
+
+    OUTPUT
+    weighted: Boolean value for whether any edges are weighted
+    */
+
+    var edges = cy.edges(),
+        weighted = false;
+    
+    //Check each edge for a weight
+    for(var i=0; i<edges.length; i++){
+        if(edges[i].style('label') !== ''){
+            weighted = true;
+        }
+    }
+
+    return weighted;
+}
+
 function makeAdjlist(nodeList){
     /*
     Writes a multiline adjacency list from a list of nodes, as used by networkX.
@@ -17,7 +38,7 @@ function makeAdjlist(nodeList){
     OUTPUT
     adjlist: A string of the multiline adjacency list
     */
-
+    var weighted = checkWeighted();
     var adjlist = '';
 
     //Go through each vertex and add it's edges to the adjlist
@@ -37,27 +58,44 @@ function makeAdjlist(nodeList){
         //Add each edge
         for(var k=0; k<numEdges; k++){
 
+
             //Check if the target is the node itself and use the source instead
             if(edges[k].data('target') === nodeList[i].data('id')){
                 var targetLabel = cy.getElementById(edges[k].data('source')).style('label');
 
                 if(targetLabel !== ''){
-                    adjlist = adjlist + targetLabel + '\r\n';
+                    adjlist = adjlist + targetLabel;
                 }
                 else{
-                    adjlist = adjlist + edges[k].data('source') + '\r\n';
+                    adjlist = adjlist + edges[k].data('source');
                 }
             }
             else{
                 var targetLabel = cy.getElementById(edges[k].data('target')).style('label');
 
                 if(targetLabel !== ''){
-                    adjlist = adjlist + targetLabel + '\r\n';
+                    adjlist = adjlist + targetLabel;
                 }
                 else{
-                    adjlist = adjlist + edges[k].data('target') + '\r\n';
+                    adjlist = adjlist + edges[k].data('target');
                 }
             }
+
+            //If we are weighted get a weight and write it
+            if(weighted){
+                var label = edges[k].style('label');
+
+                if(label !== ''){
+                    weight = label;
+                }
+                else{
+                    weight = '1';
+                }
+
+                adjlist = adjlist + " {'weight': " + weight + '}';
+            }
+
+            adjlist = adjlist + '\r\n';
         }
     }
 
@@ -111,7 +149,8 @@ function makeMatrix(nodeList){
     matrix: A string with the first line being the dimensions of a matrix,
     and then a jagged array to represent the matrix.
     */
-
+    
+    //Check if the user has specified any weights in the graph
     var matrix = nodeList.length.toString() + ',' + nodeList.length.toString()
     + '\r\n';
     matrix = matrix + '[';