Move lib/layout to lib

dagrejs · Oct 2, 2013 · 8c33e57 · 8c33e57
1 parent 92b50a9
commit 8c33e57
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 17 deletions.
diff --git a/index.js b/index.js
@@ -21,5 +21,5 @@ THE SOFTWARE.
 */
 exports.Digraph = require("graphlib").Digraph;
 exports.Graph = require("graphlib").Graph;
-exports.layout = require("./lib/layout/layout");
+exports.layout = require("./lib/layout");
 exports.version = require("./lib/version");
diff --git a/lib/layout/acyclic.js → lib/acyclic.js b/lib/layout/acyclic.js → lib/acyclic.js
@@ -1,4 +1,4 @@
-var util = require("../util");
+var util = require("./util");
 
 module.exports = instrumentedRun;
 module.exports.undo = undo;

diff --git a/lib/layout/layout.js → lib/layout.js b/lib/layout/layout.js → lib/layout.js
@@ -1,4 +1,4 @@
-var util = require("../util"),
+var util = require("./util"),
     rank = require("./rank"),
     acyclic = require("./acyclic"),
     CDigraph = require("graphlib").CDigraph,

diff --git a/lib/layout/order.js → lib/order.js b/lib/layout/order.js → lib/order.js
@@ -1,4 +1,4 @@
-var util = require("../util"),
+var util = require("./util"),
     crossCount = require("./order/crossCount"),
     initLayerGraphs = require("./order/initLayerGraphs"),
     initOrder = require("./order/initOrder"),

diff --git a/lib/layout/order/crossCount.js → lib/order/crossCount.js b/lib/layout/order/crossCount.js → lib/order/crossCount.js
@@ -1,4 +1,4 @@
-var util = require("../../util");
+var util = require("../util");
 
 module.exports = crossCount;
 

diff --git a/lib/layout/order/initLayerGraphs.js → lib/order/initLayerGraphs.js b/lib/layout/order/initLayerGraphs.js → lib/order/initLayerGraphs.js
diff --git a/lib/layout/order/initOrder.js → lib/order/initOrder.js b/lib/layout/order/initOrder.js → lib/order/initOrder.js
diff --git a/lib/layout/order/sortLayer.js → lib/order/sortLayer.js b/lib/layout/order/sortLayer.js → lib/order/sortLayer.js
@@ -1,4 +1,4 @@
-var util = require("../../util"),
+var util = require("../util"),
     Digraph = require("graphlib").Digraph,
     topsort = require("graphlib").alg.topsort,
     nodesFromList = require("graphlib").filter.nodesFromList;

diff --git a/lib/layout/position.js → lib/position.js b/lib/layout/position.js → lib/position.js
@@ -1,4 +1,4 @@
-var util = require("../util"),
+var util = require("./util"),
     nodesFromList = require("graphlib").filter.nodesFromList;
 
 /*

diff --git a/lib/layout/rank.js → lib/rank.js b/lib/layout/rank.js → lib/rank.js
@@ -1,4 +1,4 @@
-var util = require("../util"),
+var util = require("./util"),
     components = require("graphlib").alg.components,
     filter = require("graphlib").filter;
     PriorityQueue = require("graphlib").data.PriorityQueue,

diff --git a/test/layout/acyclic-test.js b/test/layout/acyclic-test.js
@@ -1,6 +1,6 @@
 var assert = require("../assert"),
     dot = require("graphlib-dot"),
-    acyclic = require("../../lib/layout/acyclic"),
+    acyclic = require("../../lib/acyclic"),
     isAcyclic = require("graphlib").alg.isAcyclic,
     findCycles = require("graphlib").alg.findCycles;
 

diff --git a/test/layout/order-test.js b/test/layout/order-test.js
@@ -1,8 +1,8 @@
 var assert = require("../assert"),
     CDigraph = require("graphlib").CDigraph,
     Digraph = require("graphlib").Digraph,
-    order = require("../../lib/layout/order"),
-    crossCount = require("../../lib/layout/order/crossCount");
+    order = require("../../lib/order"),
+    crossCount = require("../../lib/order/crossCount");
 
 describe("order", function() {
   var g;

diff --git a/test/layout/order/crossCount-test.js b/test/layout/order/crossCount-test.js
@@ -1,6 +1,6 @@
 var assert = require("../../assert"),
     Digraph = require("graphlib").Digraph,
-    crossCount = require("../../../lib/layout/order/crossCount");
+    crossCount = require("../../../lib/order/crossCount");
 
 describe("crossCount", function() {
   var g;

diff --git a/test/layout/order/initLayerGraphs-test.js b/test/layout/order/initLayerGraphs-test.js
@@ -1,6 +1,6 @@
 var assert = require("../../assert"),
     CDigraph = require("graphlib").CDigraph,
-    initLayerGraphs = require("../../../lib/layout/order/initLayerGraphs");
+    initLayerGraphs = require("../../../lib/order/initLayerGraphs");
 
 describe("initLayerGraphs", function() {
   var g;

diff --git a/test/layout/order/initOrder-test.js b/test/layout/order/initOrder-test.js
@@ -1,5 +1,5 @@
 var assert = require('../../assert'),
-    initOrder = require('../../../lib/layout/order/initOrder'),
+    initOrder = require('../../../lib/order/initOrder'),
     CDigraph = require('graphlib').CDigraph;
 
 describe('initOrder', function() {

diff --git a/test/layout/order/sortLayer-test.js b/test/layout/order/sortLayer-test.js
@@ -1,6 +1,6 @@
 var assert = require('../../assert'),
-    initLayerGraphs = require('../../../lib/layout/order/initLayerGraphs'),
-    sortLayer = require('../../../lib/layout/order/sortLayer'),
+    initLayerGraphs = require('../../../lib/order/initLayerGraphs'),
+    sortLayer = require('../../../lib/order/sortLayer'),
     CDigraph = require('graphlib').CDigraph,
     Digraph = require('graphlib').Digraph;
 

diff --git a/test/layout/rank-test.js b/test/layout/rank-test.js
@@ -1,6 +1,6 @@
 var assert = require("../assert"),
     dot = require("graphlib-dot"),
-    rank = require("../../lib/layout/rank");
+    rank = require("../../lib/rank");
 
 describe("layout/rank", function() {
   it("assigns rank 0 to a node in a singleton graph", function() {