eg-graph - npm Package Compare versions

Comparing version 0.0.7 to 0.0.8

lib/transformer/coarse-graining.js

@@ -31,5 +31,3 @@ 'use strict';
 
-var transform = function transform(gOrig, vertexVisibility, edgeVisibility) {
-  var g = new _Graph2['default']();
-
+var transform = function transform(g, vertexVisibility, edgeVisibility) {
   var _iteratorNormalCompletion = true;
@@ -40,6 +38,14 @@ var _didIteratorError = false;
   try {
-    for (var _iterator = _getIterator(gOrig.vertices()), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var u = _step.value;
+    for (var _iterator = _getIterator(g.edges()), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var _step$value = _slicedToArray(_step.value, 2);
 
-      g.addVertex(u, gOrig.vertex(u));
+      var u = _step$value[0];
+      var v = _step$value[1];
+
+      var ud = g.vertex(u),
+          vd = g.vertex(v),
+          d = g.edge(u, v);
+      if (!edgeVisibility({ u: u, v: v, ud: ud, vd: vd, d: d })) {
+        g.removeEdge(u, v);
+      }
     }
@@ -66,53 +72,20 @@ } catch (err) {
   try {
-    for (var _iterator2 = _getIterator(gOrig.edges()), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-      var _step2$value = _slicedToArray(_step2.value, 2);
+    for (var _iterator2 = _getIterator(g.vertices()), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+      var u = _step2.value;
 
-      var u = _step2$value[0];
-      var v = _step2$value[1];
-
-      var ud = gOrig.vertex(u),
-          vd = gOrig.vertex(v),
-          d = gOrig.edge(u, v);
-      if (edgeVisibility({ u: u, v: v, ud: ud, vd: vd, d: d })) {
-        g.addEdge(u, v, gOrig.edge(u, v));
-      }
-    }
-  } catch (err) {
-    _didIteratorError2 = true;
-    _iteratorError2 = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion2 && _iterator2['return']) {
-        _iterator2['return']();
-      }
-    } finally {
-      if (_didIteratorError2) {
-        throw _iteratorError2;
-      }
-    }
-  }
-
-  var _iteratorNormalCompletion3 = true;
-  var _didIteratorError3 = false;
-  var _iteratorError3 = undefined;
-
-  try {
-    for (var _iterator3 = _getIterator(g.vertices()), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-      var u = _step3.value;
-
       if (!vertexVisibility({ u: u, d: g.vertex(u) })) {
-        var _iteratorNormalCompletion4 = true;
-        var _didIteratorError4 = false;
-        var _iteratorError4 = undefined;
+        var _iteratorNormalCompletion3 = true;
+        var _didIteratorError3 = false;
+        var _iteratorError3 = undefined;
 
         try {
-          for (var _iterator4 = _getIterator(g.inVertices(u)), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-            var v = _step4.value;
-            var _iteratorNormalCompletion5 = true;
-            var _didIteratorError5 = false;
-            var _iteratorError5 = undefined;
+          for (var _iterator3 = _getIterator(g.inVertices(u)), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+            var v = _step3.value;
+            var _iteratorNormalCompletion4 = true;
+            var _didIteratorError4 = false;
+            var _iteratorError4 = undefined;
 
             try {
-              for (var _iterator5 = _getIterator(g.outVertices(u)), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-                var w = _step5.value;
+              for (var _iterator4 = _getIterator(g.outVertices(u)), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+                var w = _step4.value;
 
@@ -122,12 +95,12 @@ g.addEdge(v, w);
             } catch (err) {
-              _didIteratorError5 = true;
-              _iteratorError5 = err;
+              _didIteratorError4 = true;
+              _iteratorError4 = err;
             } finally {
               try {
-                if (!_iteratorNormalCompletion5 && _iterator5['return']) {
-                  _iterator5['return']();
+                if (!_iteratorNormalCompletion4 && _iterator4['return']) {
+                  _iterator4['return']();
                 }
               } finally {
-                if (_didIteratorError5) {
-                  throw _iteratorError5;
+                if (_didIteratorError4) {
+                  throw _iteratorError4;
                 }
@@ -138,12 +111,12 @@ }
         } catch (err) {
-          _didIteratorError4 = true;
-          _iteratorError4 = err;
+          _didIteratorError3 = true;
+          _iteratorError3 = err;
         } finally {
           try {
-            if (!_iteratorNormalCompletion4 && _iterator4['return']) {
-              _iterator4['return']();
+            if (!_iteratorNormalCompletion3 && _iterator3['return']) {
+              _iterator3['return']();
             }
           } finally {
-            if (_didIteratorError4) {
-              throw _iteratorError4;
+            if (_didIteratorError3) {
+              throw _iteratorError3;
             }
@@ -157,12 +130,12 @@ }
   } catch (err) {
-    _didIteratorError3 = true;
-    _iteratorError3 = err;
+    _didIteratorError2 = true;
+    _iteratorError2 = err;
   } finally {
     try {
-      if (!_iteratorNormalCompletion3 && _iterator3['return']) {
-        _iterator3['return']();
+      if (!_iteratorNormalCompletion2 && _iterator2['return']) {
+        _iterator2['return']();
       }
     } finally {
-      if (_didIteratorError3) {
-        throw _iteratorError3;
+      if (_didIteratorError2) {
+        throw _iteratorError2;
       }
@@ -169,0 +142,0 @@ }

lib/transformer/edge-concentration.js

@@ -140,2 +140,5 @@ 'use strict';
     h2.sort(cmp);
+    if (degree[h2[jOffset]] === 0) {
+      break;
+    }
 
@@ -296,3 +299,3 @@ var maxEdges = 0,
 
-    if (jOffset >= h2.length || degree[h2[jOffset]] === 0) {
+    if (jOffset >= h2.length) {
       break;
@@ -356,4 +359,3 @@ }
     key: 'transform',
-    value: function transform(gOrig) {
-      var g = _copy2['default'](gOrig);
+    value: function transform(g) {
       this.cycleRemoval().call(g);
@@ -360,0 +362,0 @@ var layerMap = this.layerAssignment().call(g);

lib/transformer/index.js

@@ -15,2 +15,6 @@ 'use strict';
 
+var _CopyTransformer = require('./copy');
+
+var _CopyTransformer2 = _interopRequireDefault(_CopyTransformer);
+
 var _EdgeConcentrationTransformer = require('./edge-concentration');
@@ -36,2 +40,3 @@
   CoarseGrainingTransformer: _CoarseGrainingTransformer2['default'],
+  CopyTransformer: _CopyTransformer2['default'],
   EdgeConcentrationTransformer: _EdgeConcentrationTransformer2['default'],
@@ -38,0 +43,0 @@ IdentityTransformer: _IdentityTransformer2['default'],

lib/transformer/ism.js

@@ -71,4 +71,3 @@ 'use strict';
       return transform;
-    })(function (gOrig) {
-      var g = _copy2['default'](gOrig);
+    })(function (g) {
       transform(g);
@@ -75,0 +74,0 @@ return g;

package.json

 {
   "name": "eg-graph",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Graph drawig tool",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

172591

0.15%

Number of package files

56

1.82%

Lines of code

5219

0.1%

No dependency changes