Prettier on tests as well

package.json

@@ -29,7 +29,7 @@
       "pretest": "npm run build",
       "test": "vows --nocolor; echo",
       "clean": "rm -rf node_modules",
-      "prettier": "prettier --single-quote --write 'src/**/*.js'"
+      "prettier": "prettier --single-quote --write '{src,test}/**/*.js'"
    },
    "files": [
       "dist"

test/all_pairs_distance-test.js

@@ -1,57 +1,58 @@
-var reorder = require("../dist/reorder.cjs");
+var reorder = require('../dist/reorder.cjs');
 
+var vows = require('vows'),
+  assert = require('assert');
 
-var vows = require("vows"),
-    assert = require("assert");
-
-var suite = vows.describe("reorder.all-pairs-distance");
+var suite = vows.describe('reorder.all-pairs-distance');
 
 function dotest(graph) {
-    var mat = reorder.all_pairs_distance(graph),
-	bfs = reorder.all_pairs_distance_bfs(graph),
-	n = graph.nodes().length;
-
-    assert.equal(mat.length, 1); // 1 component
-    assert.deepEqual(mat[0], bfs);
-
-    // var dn = reorder.floyd_warshall_with_path(graph),
-    // 	dist = dn[0],
-    // 	next = dn[1];
-    // assert.deepEqual(mat[0], dist);
-    // for (var i = 0; i < n-1; i++) {
-    // 	for (var j = i+1; j < n; j++) {
-    // 	    assert.equal(dist[i][j],
-    // 			 reorder.floyd_warshall_path(next, i, j).length-1);
-    // 	}
-    // }
-    return mat;
+  var mat = reorder.all_pairs_distance(graph),
+    bfs = reorder.all_pairs_distance_bfs(graph),
+    n = graph.nodes().length;
+
+  assert.equal(mat.length, 1); // 1 component
+  assert.deepEqual(mat[0], bfs);
+
+  // var dn = reorder.floyd_warshall_with_path(graph),
+  // 	dist = dn[0],
+  // 	next = dn[1];
+  // assert.deepEqual(mat[0], dist);
+  // for (var i = 0; i < n-1; i++) {
+  // 	for (var j = i+1; j < n; j++) {
+  // 	    assert.equal(dist[i][j],
+  // 			 reorder.floyd_warshall_path(next, i, j).length-1);
+  // 	}
+  // }
+  return mat;
 }
 
 suite.addBatch({
-    "all_pairs_distance": {
-	"simple": function() {
-	    var nodes = [{id: 0}, {id: 1}, {id: 2}],
-	        links = [{source: 0, target: 1}, {source:1, target: 2}];
-	    var graph = reorder.graph(nodes, links)
-		.init(),
-		mat = dotest(graph);
-
-	    assert.equal(mat[0].length, 3);
-	    assert.deepEqual(mat[0], [[0, 1, 2],
-				      [1, 0, 1],
-				      [2, 1, 0]]);
-	},
-	"hard": function() {
-	    // compare results with Dijkstra distances
-	    // from a random node.
-	    for (var i = 10; i < 100; i++) {
-		var graph = reorder.graph_connect(
-		    reorder.graph_random(i, 0.2));
-		dotest(graph);
-	    }
-	}
-    }
+  all_pairs_distance: {
+    simple: function () {
+      var nodes = [{ id: 0 }, { id: 1 }, { id: 2 }],
+        links = [
+          { source: 0, target: 1 },
+          { source: 1, target: 2 },
+        ];
+      var graph = reorder.graph(nodes, links).init(),
+        mat = dotest(graph);
+
+      assert.equal(mat[0].length, 3);
+      assert.deepEqual(mat[0], [
+        [0, 1, 2],
+        [1, 0, 1],
+        [2, 1, 0],
+      ]);
+    },
+    hard: function () {
+      // compare results with Dijkstra distances
+      // from a random node.
+      for (var i = 10; i < 100; i++) {
+        var graph = reorder.graph_connect(reorder.graph_random(i, 0.2));
+        dotest(graph);
+      }
+    },
+  },
 });
 
 suite.export(module);
-

test/barycenter-test.js

@@ -1,53 +1,53 @@
-var reorder = require("../dist/reorder.cjs");
+var reorder = require('../dist/reorder.cjs');
 
-var vows = require("vows"),
-    assert = require("assert");
+var vows = require('vows'),
+  assert = require('assert');
 
-var suite = vows.describe("reorder.barycenter");
+var suite = vows.describe('reorder.barycenter');
 
 function dotest(mat) {
-    var graph = reorder.mat2graph(mat, true);
-    //reorder.displaymat(mat);
-    var initial_crossings = reorder.count_crossings(graph);
-    var perms = reorder.barycenter_order(graph);
-    // console.log('VOrder: %j, HOrder: %j, Crossings: %d',
-    // 		perms[1], perms[0], perms[2]);
-    // reorder.displaymat(mat, perms[1], perms[0]);
-    assert.isTrue(initial_crossings > perms[2]);
-    var perms2 = reorder.adjacent_exchange(graph, perms[0], perms[1]);
-    if (perms2[2]) {
-	//reorder.displaymat(mat, perms2[1], perms2[0]);
-	var crossings = reorder.count_crossings(
-	    graph, perms2[0], perms2[1]);
-	assert.equal(crossings, perms[2]-perms2[2]);
-	// console.log('final crossings: %d, improved by %d (%d%) %d',
-	// 	    crossings, perms[2]-crossings,
-	// 	    Math.round((perms[2]-crossings)*100.0/perms[2]),
-	// 	   perms2[2]);
-	// console.log('VOrder: %j, HOrder: %j', perms2[1], perms2[0]);
-	assert.isTrue(crossings < perms[2]);
-    }
+  var graph = reorder.mat2graph(mat, true);
+  //reorder.displaymat(mat);
+  var initial_crossings = reorder.count_crossings(graph);
+  var perms = reorder.barycenter_order(graph);
+  // console.log('VOrder: %j, HOrder: %j, Crossings: %d',
+  // 		perms[1], perms[0], perms[2]);
+  // reorder.displaymat(mat, perms[1], perms[0]);
+  assert.isTrue(initial_crossings > perms[2]);
+  var perms2 = reorder.adjacent_exchange(graph, perms[0], perms[1]);
+  if (perms2[2]) {
+    //reorder.displaymat(mat, perms2[1], perms2[0]);
+    var crossings = reorder.count_crossings(graph, perms2[0], perms2[1]);
+    assert.equal(crossings, perms[2] - perms2[2]);
+    // console.log('final crossings: %d, improved by %d (%d%) %d',
+    // 	    crossings, perms[2]-crossings,
+    // 	    Math.round((perms[2]-crossings)*100.0/perms[2]),
+    // 	   perms2[2]);
+    // console.log('VOrder: %j, HOrder: %j', perms2[1], perms2[0]);
+    assert.isTrue(crossings < perms[2]);
+  }
 }
 
 suite.addBatch({
-    "barycenter": {
-	"simple": function() {
-	    var mat = [
-		[0, 1, 0, 1, 0],
-		[1, 0, 1, 0, 1],
-		[0, 1, 0, 1, 1],
-		[1, 1, 1, 0, 0]];
-	    dotest(mat);
-	},
-	"hard": function() {
-	    for (var i = 10; i < 100; i += 20) {
-		for (var j = 10; j < 100; j += 20) {
-		    var mat = reorder.random_matrix(0.2, i, j, false);
-		    dotest(mat);
-		}
-	    }
-	}
-    }
+  barycenter: {
+    simple: function () {
+      var mat = [
+        [0, 1, 0, 1, 0],
+        [1, 0, 1, 0, 1],
+        [0, 1, 0, 1, 1],
+        [1, 1, 1, 0, 0],
+      ];
+      dotest(mat);
+    },
+    hard: function () {
+      for (var i = 10; i < 100; i += 20) {
+        for (var j = 10; j < 100; j += 20) {
+          var mat = reorder.random_matrix(0.2, i, j, false);
+          dotest(mat);
+        }
+      }
+    },
+  },
 });
 
 suite.export(module);

test/bfs-test.js

@@ -1,28 +1,28 @@
-var reorder = require("../dist/reorder.cjs");
+var reorder = require('../dist/reorder.cjs');
 
+var vows = require('vows'),
+  assert = require('assert');
 
-var vows = require("vows"),
-    assert = require("assert");
-
-var suite = vows.describe("reorder.bfs");
+var suite = vows.describe('reorder.bfs');
 
 suite.addBatch({
-    "all_pairs_distance": {
-	"simple": function() {
-	    var nodes = [{id: 0}, {id: 1}, {id: 2}],
-	        links = [{source: 0, target: 1}, {source:1, target: 2}];
-	    var graph = reorder.graph(nodes, links)
-		.init();
-	    var dist = reorder.bfs_distances(graph, 0);
-	    //console.log('Dist: %j', dist);
+  all_pairs_distance: {
+    simple: function () {
+      var nodes = [{ id: 0 }, { id: 1 }, { id: 2 }],
+        links = [
+          { source: 0, target: 1 },
+          { source: 1, target: 2 },
+        ];
+      var graph = reorder.graph(nodes, links).init();
+      var dist = reorder.bfs_distances(graph, 0);
+      //console.log('Dist: %j', dist);
 
-	    assert.equal(Object.keys(dist).length, 3); 
-	    assert.equal(dist[0], 0);
-	    assert.equal(dist[1], 1);
-	    assert.equal(dist[2], 2);
-	}
-    }
+      assert.equal(Object.keys(dist).length, 3);
+      assert.equal(dist[0], 0);
+      assert.equal(dist[1], 1);
+      assert.equal(dist[2], 2);
+    },
+  },
 });
 
 suite.export(module);
-