@knowvah/dot-engine 2.10.3 → 2.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/common/agerr.d.ts +12 -0
- package/dist/common/agerr.d.ts.map +1 -1
- package/dist/gvc/context.d.ts.map +1 -1
- package/dist/gvc/emit-xdot.d.ts.map +1 -1
- package/dist/gvc/layout-reset.d.ts +38 -1
- package/dist/gvc/layout-reset.d.ts.map +1 -1
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1260 -387
- package/dist/index.js.map +4 -4
- package/dist/layout/circo/circular.d.ts.map +1 -1
- package/dist/layout/dot/edge-route-chain.d.ts.map +1 -1
- package/dist/layout/dot/edge-route-helpers.d.ts +6 -1
- package/dist/layout/dot/edge-route-helpers.d.ts.map +1 -1
- package/dist/layout/dot/edge-route-rank.d.ts +4 -1
- package/dist/layout/dot/edge-route-rank.d.ts.map +1 -1
- package/dist/layout/dot/index.d.ts.map +1 -1
- package/dist/layout/dot/init.d.ts.map +1 -1
- package/dist/layout/fdp/cluster-edges.d.ts +11 -0
- package/dist/layout/fdp/cluster-edges.d.ts.map +1 -1
- package/dist/layout/neato/closest.d.ts +20 -0
- package/dist/layout/neato/closest.d.ts.map +1 -0
- package/dist/layout/neato/constrained-majorization.d.ts +13 -0
- package/dist/layout/neato/constrained-majorization.d.ts.map +1 -1
- package/dist/layout/neato/embed-graph.d.ts +20 -0
- package/dist/layout/neato/embed-graph.d.ts.map +1 -0
- package/dist/layout/neato/fdp-adjust.d.ts.map +1 -1
- package/dist/layout/neato/index.d.ts.map +1 -1
- package/dist/layout/neato/init-dim.d.ts +54 -0
- package/dist/layout/neato/init-dim.d.ts.map +1 -0
- package/dist/layout/neato/init.d.ts +1 -11
- package/dist/layout/neato/init.d.ts.map +1 -1
- package/dist/layout/neato/kk.d.ts +4 -2
- package/dist/layout/neato/kk.d.ts.map +1 -1
- package/dist/layout/neato/matrix-ops-dense.d.ts +34 -0
- package/dist/layout/neato/matrix-ops-dense.d.ts.map +1 -0
- package/dist/layout/neato/pca.d.ts +14 -0
- package/dist/layout/neato/pca.d.ts.map +1 -0
- package/dist/layout/neato/sgd.d.ts +2 -3
- package/dist/layout/neato/sgd.d.ts.map +1 -1
- package/dist/layout/neato/start.d.ts +5 -5
- package/dist/layout/neato/start.d.ts.map +1 -1
- package/dist/layout/neato/stress-kernel.d.ts +10 -2
- package/dist/layout/neato/stress-kernel.d.ts.map +1 -1
- package/dist/layout/neato/stress-subspace.d.ts +39 -0
- package/dist/layout/neato/stress-subspace.d.ts.map +1 -0
- package/dist/layout/neato/vpsc-adjust.d.ts.map +1 -1
- package/dist/layout/pack/ccomps.d.ts +4 -2
- package/dist/layout/pack/ccomps.d.ts.map +1 -1
- package/dist/layout/sfdp/index.d.ts.map +1 -1
- package/dist/layout/sfdp/init.d.ts +6 -7
- package/dist/layout/sfdp/init.d.ts.map +1 -1
- package/dist/layout/twopi/circle.d.ts.map +1 -1
- package/dist/layout/twopi/index.d.ts.map +1 -1
- package/dist/render/dot/attrs.d.ts +7 -0
- package/dist/render/dot/attrs.d.ts.map +1 -1
- package/dist/render.js +1637 -770
- package/dist/render.js.map +4 -4
- package/package.json +4 -4
- package/src/common/agerr.ts +49 -1
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.1 +20 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.2 +20 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.3 +20 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.gv +1 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.dot.plain.nofree.1 +22 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.dot.plain.nofree.2 +22 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.dot.plain.nofree.3 +22 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.gv +1 -0
- package/src/gvc/__fixtures__/rerender/abom-shift.dot.plain.nofree.1 +13 -0
- package/src/gvc/__fixtures__/rerender/abom-shift.dot.plain.nofree.2 +13 -0
- package/src/gvc/__fixtures__/rerender/abom-shift.dot.plain.nofree.3 +13 -0
- package/src/gvc/__fixtures__/rerender/abom-shift.gv +1 -0
- package/src/gvc/__fixtures__/rerender/cluster-edge-splines.fdp.plain.1 +10 -0
- package/src/gvc/__fixtures__/rerender/cluster-edge-splines.fdp.plain.2 +11 -0
- package/src/gvc/__fixtures__/rerender/cluster-edge-splines.gv +9 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.dot.1 +40 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.dot.2 +40 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.plain.noaddr.1 +15 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.plain.noaddr.2 +17 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-dot-plain.1 +40 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-dot-plain.2 +15 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-dot-svg.1 +40 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-dot-svg.2 +99 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-json-json.1 +489 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-json-json.2 +503 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-nofree-dot-svg.1 +40 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.seq-nofree-dot-svg.2 +109 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.xdot.1 +69 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.fdp.xdot.2 +70 -0
- package/src/gvc/__fixtures__/rerender/cluster-edges.gv +15 -0
- package/src/gvc/__fixtures__/rerender/fdp-1581.fdp.dot.1 +104 -0
- package/src/gvc/__fixtures__/rerender/fdp-1581.fdp.dot.2 +104 -0
- package/src/gvc/__fixtures__/rerender/fdp-1581.gv +26 -0
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.1 +34 -0
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.2 +34 -0
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.3 +34 -0
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.gv +33 -0
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.1 +181 -0
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.2 +218 -0
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.3 +255 -0
- package/src/gvc/__fixtures__/rerender/regen.sh +25 -0
- package/src/gvc/context.ts +7 -2
- package/src/gvc/emit-xdot.ts +37 -7
- package/src/gvc/layout-reset.ts +59 -1
- package/src/index.ts +4 -0
- package/src/layout/circo/circular.ts +3 -1
- package/src/layout/dot/edge-route-chain.ts +79 -7
- package/src/layout/dot/edge-route-helpers.ts +8 -2
- package/src/layout/dot/edge-route-rank.ts +20 -2
- package/src/layout/dot/index.ts +17 -2
- package/src/layout/dot/init.ts +9 -17
- package/src/layout/dot/splines-flat.ts +12 -12
- package/src/layout/dot/splines.ts +2 -2
- package/src/layout/fdp/cluster-edges.ts +0 -0
- package/src/layout/fdp/index.ts +2 -2
- package/src/layout/neato/__fixtures__/dim/circuit-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/circuit-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/circuit-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/circuit-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/dim11-dimen11.dot +32 -0
- package/src/layout/neato/__fixtures__/dim/dim11-dimen11.gv +11 -0
- package/src/layout/neato/__fixtures__/dim/dim11-dimen11.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/dim11-dimen11.xdot +53 -0
- package/src/layout/neato/__fixtures__/dim/dim3-dimen3.dot +32 -0
- package/src/layout/neato/__fixtures__/dim/dim3-dimen3.gv +11 -0
- package/src/layout/neato/__fixtures__/dim/dim3-dimen3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/dim3-dimen3.xdot +53 -0
- package/src/layout/neato/__fixtures__/dim/dim3.dot +31 -0
- package/src/layout/neato/__fixtures__/dim/dim3.gv +10 -0
- package/src/layout/neato/__fixtures__/dim/dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/dim3.xdot +52 -0
- package/src/layout/neato/__fixtures__/dim/dim4-dimen4.dot +32 -0
- package/src/layout/neato/__fixtures__/dim/dim4-dimen4.gv +11 -0
- package/src/layout/neato/__fixtures__/dim/dim4-dimen4.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/dim4-dimen4.xdot +53 -0
- package/src/layout/neato/__fixtures__/dim/dimen3.dot +31 -0
- package/src/layout/neato/__fixtures__/dim/dimen3.gv +10 -0
- package/src/layout/neato/__fixtures__/dim/dimen3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/dimen3.xdot +52 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.dot +267 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.gv +84 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.xdot +468 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.dot +267 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.gv +84 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.xdot +468 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.dot +268 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.gv +85 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.xdot +469 -0
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.dot +484 -0
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.gv +151 -0
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.xdot +852 -0
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.dot +34 -0
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.gv +13 -0
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.xdot +55 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim4.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim4.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim4.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-dim4.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim2.dot +32 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim2.gv +11 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim2.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim2.xdot +53 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim3.dot +34 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim3.gv +13 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-dirnone-dim3.xdot +55 -0
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.dot +37 -0
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.xdot +58 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.dot +141 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.gv +48 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.stderr +1 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.xdot +233 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim2.dot +21 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim2.gv +8 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim2.stderr +1 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim2.xdot +33 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim3.dot +23 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim3.gv +10 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim3.stderr +1 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim3.xdot +35 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim4.dot +23 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim4.gv +10 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim4.stderr +1 -0
- package/src/layout/neato/__fixtures__/dim/hier-noedge-dim4.xdot +35 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim2.dot +26 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim2.gv +7 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim2.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim2.xdot +44 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim3.dot +28 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim3.gv +9 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-nohier-dim3.xdot +46 -0
- package/src/layout/neato/__fixtures__/dim/hier-pack-dim3.dot +48 -0
- package/src/layout/neato/__fixtures__/dim/hier-pack-dim3.gv +15 -0
- package/src/layout/neato/__fixtures__/dim/hier-pack-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-pack-dim3.xdot +79 -0
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.dot +56 -0
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.gv +17 -0
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.xdot +94 -0
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.dot +47 -0
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.gv +14 -0
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.xdot +78 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim3.dot +34 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim3.gv +13 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim3.xdot +55 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.dot +34 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.gv +13 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.xdot +55 -0
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.dot +34 -0
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.gv +13 -0
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.xdot +55 -0
- package/src/layout/neato/__fixtures__/dim/hier-two-dim3.dot +15 -0
- package/src/layout/neato/__fixtures__/dim/hier-two-dim3.gv +6 -0
- package/src/layout/neato/__fixtures__/dim/hier-two-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/hier-two-dim3.xdot +22 -0
- package/src/layout/neato/__fixtures__/dim/ipsep-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/ipsep-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/ipsep-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/ipsep-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim4-dimen4.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim4-dimen4.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim4-dimen4.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/kk-dim4-dimen4.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/kk-pins-dim3.dot +39 -0
- package/src/layout/neato/__fixtures__/dim/kk-pins-dim3.gv +15 -0
- package/src/layout/neato/__fixtures__/dim/kk-pins-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/kk-pins-dim3.xdot +60 -0
- package/src/layout/neato/__fixtures__/dim/overlap-false-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/overlap-false-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/overlap-false-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/overlap-false-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/overlap-scale-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/overlap-scale-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/overlap-scale-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/overlap-scale-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/overlap-vpsc-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/overlap-vpsc-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/overlap-vpsc-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/overlap-vpsc-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/pack-dim3.dot +47 -0
- package/src/layout/neato/__fixtures__/dim/pack-dim3.gv +14 -0
- package/src/layout/neato/__fixtures__/dim/pack-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/pack-dim3.xdot +78 -0
- package/src/layout/neato/__fixtures__/dim/pins-dim3.dot +38 -0
- package/src/layout/neato/__fixtures__/dim/pins-dim3.gv +14 -0
- package/src/layout/neato/__fixtures__/dim/pins-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/pins-dim3.xdot +59 -0
- package/src/layout/neato/__fixtures__/dim/regen.sh +24 -0
- package/src/layout/neato/__fixtures__/dim/regular-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/regular-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/regular-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/regular-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/sgd-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/sgd-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/sgd-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/sgd-dim3.xdot +54 -0
- package/src/layout/neato/__fixtures__/dim/smart-units.json +16 -0
- package/src/layout/neato/__fixtures__/dim/subset-dim3.dot +33 -0
- package/src/layout/neato/__fixtures__/dim/subset-dim3.gv +12 -0
- package/src/layout/neato/__fixtures__/dim/subset-dim3.stderr +0 -0
- package/src/layout/neato/__fixtures__/dim/subset-dim3.xdot +54 -0
- package/src/layout/neato/closest.ts +206 -0
- package/src/layout/neato/constrained-majorization.ts +4 -23
- package/src/layout/neato/embed-graph.ts +81 -0
- package/src/layout/neato/fdp-adjust.ts +22 -8
- package/src/layout/neato/index.ts +26 -17
- package/src/layout/neato/init-dim.ts +165 -0
- package/src/layout/neato/init.ts +9 -35
- package/src/layout/neato/kk.ts +47 -41
- package/src/layout/neato/matrix-ops-dense.ts +232 -0
- package/src/layout/neato/pca.ts +60 -0
- package/src/layout/neato/sgd.ts +14 -13
- package/src/layout/neato/start.ts +8 -5
- package/src/layout/neato/stress-kernel.ts +65 -5
- package/src/layout/neato/stress-subspace.ts +371 -0
- package/src/layout/neato/vpsc-adjust.ts +3 -1
- package/src/layout/pack/__fixtures__/cc-reuse/circo.dot +23 -0
- package/src/layout/pack/__fixtures__/cc-reuse/circo.gv +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/circo.stderr +0 -0
- package/src/layout/pack/__fixtures__/cc-reuse/circo.xdot +38 -0
- package/src/layout/pack/__fixtures__/cc-reuse/neato.dot +23 -0
- package/src/layout/pack/__fixtures__/cc-reuse/neato.gv +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/neato.stderr +0 -0
- package/src/layout/pack/__fixtures__/cc-reuse/neato.xdot +38 -0
- package/src/layout/pack/__fixtures__/cc-reuse/osage.dot +23 -0
- package/src/layout/pack/__fixtures__/cc-reuse/osage.gv +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/osage.stderr +0 -0
- package/src/layout/pack/__fixtures__/cc-reuse/osage.xdot +38 -0
- package/src/layout/pack/__fixtures__/cc-reuse/regen.sh +24 -0
- package/src/layout/pack/__fixtures__/cc-reuse/sfdp.dot +21 -0
- package/src/layout/pack/__fixtures__/cc-reuse/sfdp.gv +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/sfdp.stderr +0 -0
- package/src/layout/pack/__fixtures__/cc-reuse/sfdp.xdot +36 -0
- package/src/layout/pack/__fixtures__/cc-reuse/twopi.dot +21 -0
- package/src/layout/pack/__fixtures__/cc-reuse/twopi.gv +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/twopi.stderr +1 -0
- package/src/layout/pack/__fixtures__/cc-reuse/twopi.xdot +36 -0
- package/src/layout/pack/ccomps.ts +34 -6
- package/src/layout/sfdp/__fixtures__/dim/dim3-dimen3.dot +32 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3-dimen3.gv +11 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3-dimen3.stderr +0 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3-dimen3.xdot +53 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3.dot +31 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3.gv +10 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3.stderr +0 -0
- package/src/layout/sfdp/__fixtures__/dim/dim3.xdot +52 -0
- package/src/layout/sfdp/__fixtures__/dim/dim4-dimen4.dot +32 -0
- package/src/layout/sfdp/__fixtures__/dim/dim4-dimen4.gv +11 -0
- package/src/layout/sfdp/__fixtures__/dim/dim4-dimen4.stderr +0 -0
- package/src/layout/sfdp/__fixtures__/dim/dim4-dimen4.xdot +53 -0
- package/src/layout/sfdp/__fixtures__/dim/overlap-prism-dim3.dot +33 -0
- package/src/layout/sfdp/__fixtures__/dim/overlap-prism-dim3.gv +12 -0
- package/src/layout/sfdp/__fixtures__/dim/overlap-prism-dim3.stderr +0 -0
- package/src/layout/sfdp/__fixtures__/dim/overlap-prism-dim3.xdot +54 -0
- package/src/layout/sfdp/__fixtures__/dim/regen.sh +24 -0
- package/src/layout/sfdp/index.ts +15 -10
- package/src/layout/sfdp/init.ts +26 -11
- package/src/layout/twopi/circle.ts +5 -1
- package/src/layout/twopi/index.ts +3 -0
- package/src/render/dot/agwrite.ts +2 -2
- package/src/render/dot/attrs.ts +16 -0
- package/src/render/dot/write-back.ts +2 -2
package/src/layout/neato/kk.ts
CHANGED
|
@@ -35,9 +35,8 @@ import { lenattr } from './edge-len.js';
|
|
|
35
35
|
import { newPathState, shortestPath, mdsModel, subsetModel, type Neighbour } from './kk-paths.js';
|
|
36
36
|
import { agerr, agwarningf } from '../../common/agerr.js';
|
|
37
37
|
import { fma, fms } from '../../common/fma.js';
|
|
38
|
+
import { jitter3d, ndimOf } from './init-dim.js';
|
|
38
39
|
|
|
39
|
-
/** `Ndim`: layout dimension (this port lays out in 2-D only). */
|
|
40
|
-
const NDIM = 2;
|
|
41
40
|
/** `Damping` when the root has no `Damping` attribute. @see stuff.c:scan_graph_mode */
|
|
42
41
|
const DEFAULT_DAMPING = 0.99;
|
|
43
42
|
/** `Epsilon` is this times nV unless `epsilon` is set. @see stuff.c:scan_graph_mode */
|
|
@@ -50,14 +49,16 @@ const SPRING_COEFF = 1.0;
|
|
|
50
49
|
/** Per-run solver state. @see lib/neatogen/stuff.c (GD_*, Epsilon2, Damping) */
|
|
51
50
|
export interface KkState {
|
|
52
51
|
readonly n: number;
|
|
52
|
+
/** `Ndim`, the root's layout dimension. */
|
|
53
|
+
readonly ndim: number;
|
|
53
54
|
readonly nodes: readonly Node[];
|
|
54
55
|
/** `GD_dist`, n*n. */
|
|
55
56
|
readonly dist: Float64Array;
|
|
56
57
|
/** `GD_spring`, n*n. */
|
|
57
58
|
readonly spring: Float64Array;
|
|
58
|
-
/** `GD_sum_t`, n*
|
|
59
|
+
/** `GD_sum_t`, n*ndim. */
|
|
59
60
|
readonly sumT: Float64Array;
|
|
60
|
-
/** `GD_t`, n*n*
|
|
61
|
+
/** `GD_t`, n*n*ndim. */
|
|
61
62
|
readonly t: Float64Array;
|
|
62
63
|
readonly damping: number;
|
|
63
64
|
readonly epsilon: number;
|
|
@@ -133,9 +134,10 @@ function scanGraphMode(g: Graph, maxIter: number): { st: KkState; adj: Neighbour
|
|
|
133
134
|
const damp = g.root.attrs.get('Damping');
|
|
134
135
|
const { total, lens } = setEdgeLens(g, nodes);
|
|
135
136
|
const ini = initialDist(g, total, epsilon);
|
|
137
|
+
const ndim = ndimOf(g);
|
|
136
138
|
const st: KkState = {
|
|
137
|
-
n, nodes, dist: new Float64Array(n * n).fill(ini), spring: new Float64Array(n * n).fill(1),
|
|
138
|
-
sumT: new Float64Array(n *
|
|
139
|
+
n, ndim, nodes, dist: new Float64Array(n * n).fill(ini), spring: new Float64Array(n * n).fill(1),
|
|
140
|
+
sumT: new Float64Array(n * ndim).fill(1), t: new Float64Array(n * n * ndim),
|
|
139
141
|
damping: damp === undefined ? DEFAULT_DAMPING : parseFloat(damp) || 0,
|
|
140
142
|
epsilon, maxIter, move: 0,
|
|
141
143
|
};
|
|
@@ -143,9 +145,10 @@ function scanGraphMode(g: Graph, maxIter: number): { st: KkState; adj: Neighbour
|
|
|
143
145
|
}
|
|
144
146
|
|
|
145
147
|
/** @see lib/neatogen/stuff.c:randompos (called with nG = 1 by initial_positions) */
|
|
146
|
-
function randompos(np: Node): void {
|
|
148
|
+
function randompos(np: Node, ndim: number): void {
|
|
147
149
|
np.info.pos![0] = drand48();
|
|
148
150
|
np.info.pos![1] = drand48();
|
|
151
|
+
if (ndim > 2) jitter3d(np, 1, ndim);
|
|
149
152
|
}
|
|
150
153
|
|
|
151
154
|
/** @see lib/neatogen/stuff.c:initial_positions */
|
|
@@ -155,14 +158,14 @@ function initialPositions(g: Graph, st: KkState): void {
|
|
|
155
158
|
if (init === INIT_SELF) warnStartSelfOnce();
|
|
156
159
|
for (const np of st.nodes) {
|
|
157
160
|
if (np.info.posSet === true || np.info.pinned === true) continue;
|
|
158
|
-
randompos(np);
|
|
161
|
+
randompos(np, st.ndim);
|
|
159
162
|
}
|
|
160
163
|
}
|
|
161
164
|
|
|
162
165
|
/** `distvec`: returns |p0-p1| and leaves p0-p1 in `del`. @see stuff.c:distvec */
|
|
163
|
-
function distvec(p0: number[], p1: number[], del: Float64Array): number {
|
|
166
|
+
function distvec(p0: number[], p1: number[], del: Float64Array, ndim: number): number {
|
|
164
167
|
let dist = 0.0;
|
|
165
|
-
for (let k = 0; k <
|
|
168
|
+
for (let k = 0; k < ndim; k++) {
|
|
166
169
|
del[k] = p0[k]! - p1[k]!;
|
|
167
170
|
dist = fma(del[k]!, del[k]!, dist);
|
|
168
171
|
}
|
|
@@ -185,14 +188,15 @@ function springFactors(g: Graph): (a: Node, b: Node) => number | undefined {
|
|
|
185
188
|
|
|
186
189
|
/** Row `i` of `GD_t`/`GD_sum_t` for node `i`. @see lib/neatogen/stuff.c:diffeq_model */
|
|
187
190
|
function fillRow(st: KkState, i: number, del: Float64Array): void {
|
|
191
|
+
const { ndim } = st;
|
|
188
192
|
const vi = st.nodes[i]!;
|
|
189
193
|
for (let j = 0; j < st.n; j++) {
|
|
190
194
|
if (i === j) continue;
|
|
191
|
-
const dist = distvec(vi.info.pos!, st.nodes[j]!.info.pos!, del);
|
|
192
|
-
for (let k = 0; k <
|
|
195
|
+
const dist = distvec(vi.info.pos!, st.nodes[j]!.info.pos!, del, ndim);
|
|
196
|
+
for (let k = 0; k < ndim; k++) {
|
|
193
197
|
const v = st.spring[i * st.n + j]! * (del[k]! - (st.dist[i * st.n + j]! * del[k]!) / dist);
|
|
194
|
-
st.t[(i * st.n + j) *
|
|
195
|
-
st.sumT[i *
|
|
198
|
+
st.t[(i * st.n + j) * ndim + k] = v;
|
|
199
|
+
st.sumT[i * ndim + k]! += v;
|
|
196
200
|
}
|
|
197
201
|
}
|
|
198
202
|
}
|
|
@@ -211,67 +215,68 @@ function diffeqModel(g: Graph, st: KkState): void {
|
|
|
211
215
|
}
|
|
212
216
|
}
|
|
213
217
|
st.sumT.fill(0);
|
|
214
|
-
const del = new Float64Array(
|
|
218
|
+
const del = new Float64Array(st.ndim);
|
|
215
219
|
for (let i = 0; i < n; i++) fillRow(st, i, del);
|
|
216
220
|
}
|
|
217
221
|
|
|
218
222
|
/** Recompute node `i`'s row and the mirrored column. @see stuff.c:update_arrays */
|
|
219
223
|
function updateArrays(st: KkState, i: number): void {
|
|
220
|
-
const { n } = st;
|
|
221
|
-
const del = new Float64Array(
|
|
224
|
+
const { n, ndim } = st;
|
|
225
|
+
const del = new Float64Array(ndim);
|
|
222
226
|
const vi = st.nodes[i]!;
|
|
223
|
-
for (let k = 0; k <
|
|
227
|
+
for (let k = 0; k < ndim; k++) st.sumT[i * ndim + k] = 0.0;
|
|
224
228
|
for (let j = 0; j < n; j++) {
|
|
225
229
|
if (i === j) continue;
|
|
226
|
-
const dist = distvec(vi.info.pos!, st.nodes[j]!.info.pos!, del);
|
|
227
|
-
for (let k = 0; k <
|
|
230
|
+
const dist = distvec(vi.info.pos!, st.nodes[j]!.info.pos!, del, ndim);
|
|
231
|
+
for (let k = 0; k < ndim; k++) {
|
|
228
232
|
const tij = st.spring[i * n + j]! * (del[k]! - (st.dist[i * n + j]! * del[k]!) / dist);
|
|
229
|
-
st.t[(i * n + j) *
|
|
230
|
-
st.sumT[i *
|
|
231
|
-
const old = st.t[(j * n + i) *
|
|
232
|
-
st.t[(j * n + i) *
|
|
233
|
-
st.sumT[j *
|
|
233
|
+
st.t[(i * n + j) * ndim + k] = tij;
|
|
234
|
+
st.sumT[i * ndim + k]! += tij;
|
|
235
|
+
const old = st.t[(j * n + i) * ndim + k]!;
|
|
236
|
+
st.t[(j * n + i) * ndim + k] = -tij;
|
|
237
|
+
st.sumT[j * ndim + k]! += -tij - old;
|
|
234
238
|
}
|
|
235
239
|
}
|
|
236
240
|
}
|
|
237
241
|
|
|
238
|
-
/** Hessian of node `m`'s energy into `M` (
|
|
242
|
+
/** Hessian of node `m`'s energy into `M` (ndim x ndim). @see stuff.c:D2E */
|
|
239
243
|
function d2e(st: KkState, m: number, M: Float64Array): void {
|
|
240
|
-
const { n } = st;
|
|
244
|
+
const { n, ndim } = st;
|
|
241
245
|
const vn = st.nodes[m]!;
|
|
242
|
-
const t = new Float64Array(
|
|
246
|
+
const t = new Float64Array(ndim);
|
|
243
247
|
M.fill(0);
|
|
244
248
|
for (let i = 0; i < n; i++) {
|
|
245
249
|
if (m === i) continue;
|
|
246
250
|
const vi = st.nodes[i]!;
|
|
247
251
|
let sq = 0.0;
|
|
248
|
-
for (let k = 0; k <
|
|
252
|
+
for (let k = 0; k < ndim; k++) {
|
|
249
253
|
t[k] = vn.info.pos![k]! - vi.info.pos![k]!;
|
|
250
254
|
sq = fma(t[k]!, t[k]!, sq);
|
|
251
255
|
}
|
|
252
256
|
const scale = 1 / Math.pow(sq, 1.5);
|
|
253
257
|
const K = st.spring[m * n + i]!;
|
|
254
258
|
const D = st.dist[m * n + i]!;
|
|
255
|
-
for (let k = 0; k <
|
|
256
|
-
for (let l = 0; l < k; l++) M[l *
|
|
259
|
+
for (let k = 0; k < ndim; k++) {
|
|
260
|
+
for (let l = 0; l < k; l++) M[l * ndim + k] = fma(K * D * t[k]! * t[l]!, scale, M[l * ndim + k]!);
|
|
257
261
|
const inner = fms(D * fms(t[k]!, t[k]!, sq), scale, 1.0);
|
|
258
|
-
M[k *
|
|
262
|
+
M[k * ndim + k] = fma(K, inner, M[k * ndim + k]!);
|
|
259
263
|
}
|
|
260
264
|
}
|
|
261
|
-
for (let k = 1; k <
|
|
262
|
-
for (let l = 0; l < k; l++) M[k *
|
|
265
|
+
for (let k = 1; k < ndim; k++) {
|
|
266
|
+
for (let l = 0; l < k; l++) M[k * ndim + l] = M[l * ndim + k]!;
|
|
263
267
|
}
|
|
264
268
|
}
|
|
265
269
|
|
|
266
270
|
/** Index of the unpinned node with the largest gradient, or -1. @see stuff.c:choose_node */
|
|
267
271
|
function chooseNode(st: KkState): number {
|
|
268
272
|
if (st.move >= st.maxIter) return -1;
|
|
273
|
+
const { ndim } = st;
|
|
269
274
|
let max = 0.0;
|
|
270
275
|
let choice = -1;
|
|
271
276
|
for (let i = 0; i < st.n; i++) {
|
|
272
277
|
if (st.nodes[i]!.info.pinned === true) continue;
|
|
273
278
|
let m = 0.0;
|
|
274
|
-
for (let k = 0; k <
|
|
279
|
+
for (let k = 0; k < ndim; k++) m = fma(st.sumT[i * ndim + k]!, st.sumT[i * ndim + k]!, m);
|
|
275
280
|
if (m > max) { choice = i; max = m; }
|
|
276
281
|
}
|
|
277
282
|
return max < st.epsilon * st.epsilon ? -1 : choice;
|
|
@@ -279,14 +284,15 @@ function chooseNode(st: KkState): number {
|
|
|
279
284
|
|
|
280
285
|
/** Newton step for node `m`. @see lib/neatogen/stuff.c:move_node */
|
|
281
286
|
function moveNode(st: KkState, m: number): void {
|
|
282
|
-
const
|
|
283
|
-
const
|
|
284
|
-
const
|
|
287
|
+
const { ndim } = st;
|
|
288
|
+
const a = new Float64Array(ndim * ndim);
|
|
289
|
+
const b = new Float64Array(ndim);
|
|
290
|
+
const c = new Float64Array(ndim);
|
|
285
291
|
d2e(st, m, a);
|
|
286
|
-
for (let i = 0; i <
|
|
287
|
-
solve(a, b, c,
|
|
292
|
+
for (let i = 0; i < ndim; i++) c[i] = -st.sumT[m * ndim + i]!;
|
|
293
|
+
solve(a, b, c, ndim);
|
|
288
294
|
const pos = st.nodes[m]!.info.pos!;
|
|
289
|
-
for (let i = 0; i <
|
|
295
|
+
for (let i = 0; i < ndim; i++) {
|
|
290
296
|
b[i] = fma(2 * (1 - st.damping), drand48(), st.damping) * b[i]!;
|
|
291
297
|
pos[i]! += b[i]!;
|
|
292
298
|
}
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
// SPDX-License-Identifier: EPL-2.0
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* The dense matrix routines of matrix_ops.c that the smart initial layout needs
|
|
5
|
+
* (`sparse_stress_subspace_majorization_kD`, `PCA_alloc`, `iterativePCA_1D`).
|
|
6
|
+
* `matrix-ops.ts` holds the rest of that C file.
|
|
7
|
+
*
|
|
8
|
+
* Fusion follows the 16.1 arm64 `-O3 -flto=thin` disassembly of each site (see
|
|
9
|
+
* matrix-ops.ts): products over pointer-chased rows are scalar `fmadd`; sums over
|
|
10
|
+
* one contiguous row are 8-wide (`fmul.2d` then in-order `fadd`) with an `fmadd`
|
|
11
|
+
* remainder. C's output parameters (`float ***CC`) are return values here.
|
|
12
|
+
*
|
|
13
|
+
* @see lib/neatogen/matrix_ops.c
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { crand } from '../../common/crand.js';
|
|
17
|
+
import { fma } from '../../common/fma.js';
|
|
18
|
+
import type { VtxData } from './dijkstra.js';
|
|
19
|
+
import {
|
|
20
|
+
BLOCK_NONE, copyVector, innerProduct, norm, scadd, vectorsScalarMult,
|
|
21
|
+
} from './matrix-ops.js';
|
|
22
|
+
|
|
23
|
+
const fr = Math.fround;
|
|
24
|
+
|
|
25
|
+
/** `p_iteration_threshold` @see lib/neatogen/matrix_ops.c */
|
|
26
|
+
const P_ITERATION_THRESHOLD = 1e-3;
|
|
27
|
+
/** The `len < 1e-10` colinearity and null-space test of power iteration. */
|
|
28
|
+
const POWER_LENGTH_FLOOR = 1e-10;
|
|
29
|
+
/** `rand() % 100`, the components of a guessed eigenvector. */
|
|
30
|
+
const GUESS_RANGE = 100;
|
|
31
|
+
/** Vector width of the reductions inlined in `_power_iteration` and `_stress_majorization_kD_mkernel`. */
|
|
32
|
+
const BLOCK_ROW = 8;
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* result = matrix × vector, matrix dim1 × dim2. Its inlined copies (in
|
|
36
|
+
* power_iteration and the subspace loop) are both 8-wide.
|
|
37
|
+
* @see lib/neatogen/matrix_ops.c:right_mult_with_vector_d
|
|
38
|
+
*/
|
|
39
|
+
export function rightMultWithVectorD(
|
|
40
|
+
matrix: readonly Float64Array[], dim1: number, dim2: number, vector: Float64Array, result: Float64Array,
|
|
41
|
+
): void {
|
|
42
|
+
const blocked = dim2 - (dim2 % BLOCK_ROW);
|
|
43
|
+
for (let i = 0; i < dim1; i++) {
|
|
44
|
+
const row = matrix[i]!;
|
|
45
|
+
let res = 0;
|
|
46
|
+
let j = 0;
|
|
47
|
+
for (; j < blocked; j++) res += row[j]! * vector[j]!;
|
|
48
|
+
for (; j < dim2; j++) res = fma(row[j]!, vector[j]!, res);
|
|
49
|
+
result[i] = res;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* result = matrixᵀ × vector, matrix dim2 × dim1, vector of dim2 components.
|
|
55
|
+
* @see lib/neatogen/matrix_ops.c:right_mult_with_vector_transpose
|
|
56
|
+
*/
|
|
57
|
+
export function rightMultWithVectorTranspose(
|
|
58
|
+
matrix: readonly Float64Array[], dim1: number, dim2: number, vector: Float64Array, result: Float64Array,
|
|
59
|
+
): void {
|
|
60
|
+
for (let i = 0; i < dim1; i++) {
|
|
61
|
+
let res = 0;
|
|
62
|
+
for (let j = 0; j < dim2; j++) res = fma(matrix[j]![i]!, vector[j]!, res);
|
|
63
|
+
result[i] = res;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* C = A × B: A is dim1 × dim2 (double), B is dim2 × dim3 (float), C is float.
|
|
69
|
+
* @see lib/neatogen/matrix_ops.c:mult_dense_mat
|
|
70
|
+
*/
|
|
71
|
+
export function multDenseMat(
|
|
72
|
+
A: readonly Float64Array[], B: readonly Float32Array[], dim1: number, dim2: number, dim3: number,
|
|
73
|
+
): Float32Array[] {
|
|
74
|
+
const C = Array.from({ length: dim1 }, () => new Float32Array(dim3));
|
|
75
|
+
for (let i = 0; i < dim1; i++) {
|
|
76
|
+
for (let j = 0; j < dim3; j++) {
|
|
77
|
+
let sum = 0;
|
|
78
|
+
for (let k = 0; k < dim2; k++) sum = fma(A[i]![k]!, B[k]![j]!, sum);
|
|
79
|
+
C[i]![j] = sum;
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
return C;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* C = A × B: A is dim1 × dim2 (double), B is dim2 × dim3 (float), C is double.
|
|
87
|
+
* @see lib/neatogen/matrix_ops.c:mult_dense_mat_d
|
|
88
|
+
*/
|
|
89
|
+
export function multDenseMatD(
|
|
90
|
+
A: readonly Float64Array[], B: readonly Float32Array[], dim1: number, dim2: number, dim3: number,
|
|
91
|
+
): Float64Array[] {
|
|
92
|
+
const C = Array.from({ length: dim1 }, () => new Float64Array(dim3));
|
|
93
|
+
for (let i = 0; i < dim1; i++) {
|
|
94
|
+
for (let j = 0; j < dim3; j++) {
|
|
95
|
+
let sum = 0;
|
|
96
|
+
for (let k = 0; k < dim2; k++) sum = fma(A[i]![k]!, B[k]![j]!, sum);
|
|
97
|
+
C[i]![j] = sum;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
return C;
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* C = A × Bᵀ: A is dim1 × dim1 and sparse, B is dim2 × dim1, C is float.
|
|
105
|
+
* @see lib/neatogen/matrix_ops.c:mult_sparse_dense_mat_transpose
|
|
106
|
+
*/
|
|
107
|
+
export function multSparseDenseMatTranspose(
|
|
108
|
+
A: readonly VtxData[], B: readonly Float64Array[], dim1: number, dim2: number,
|
|
109
|
+
): Float32Array[] {
|
|
110
|
+
const C = Array.from({ length: dim1 }, () => new Float32Array(dim2));
|
|
111
|
+
for (let i = 0; i < dim1; i++) {
|
|
112
|
+
const { edges, ewgts, nedges } = A[i]!;
|
|
113
|
+
for (let j = 0; j < dim2; j++) {
|
|
114
|
+
let sum = 0;
|
|
115
|
+
for (let k = 0; k < nedges; k++) sum = fma(fr(ewgts[k]!), B[j]![edges[k]!]!, sum);
|
|
116
|
+
C[i]![j] = sum;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return C;
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
/** Working state of one `power_iteration` call. */
|
|
123
|
+
interface PowerState {
|
|
124
|
+
readonly mat: readonly Float64Array[];
|
|
125
|
+
readonly n: number;
|
|
126
|
+
readonly eigs: readonly Float64Array[];
|
|
127
|
+
readonly evals: Float64Array;
|
|
128
|
+
readonly tmpVec: Float64Array;
|
|
129
|
+
readonly lastVec: Float64Array;
|
|
130
|
+
readonly maxIterations: number;
|
|
131
|
+
readonly tol: number;
|
|
132
|
+
iteration: number;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/** Orthogonalize `vec` against the `i` higher eigenvectors. */
|
|
136
|
+
function orthogonalize(st: PowerState, i: number, vec: Float64Array): void {
|
|
137
|
+
for (let j = 0; j < i; j++) {
|
|
138
|
+
const alpha = -innerProduct(st.n, st.eigs[j]!, vec, BLOCK_ROW);
|
|
139
|
+
scadd(vec, st.n - 1, alpha, st.eigs[j]!);
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
/** Guess the i-th eigenvector: random components, orthogonalized; returns its length. */
|
|
144
|
+
function guess(st: PowerState, i: number): number {
|
|
145
|
+
const curr = st.eigs[i]!;
|
|
146
|
+
for (let j = 0; j < st.n; j++) curr[j] = crand() % GUESS_RANGE;
|
|
147
|
+
orthogonalize(st, i, curr);
|
|
148
|
+
return norm(curr, st.n - 1, BLOCK_NONE);
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
/**
|
|
152
|
+
* Iterate the i-th eigenvector until it settles. Returns its Rayleigh quotient,
|
|
153
|
+
* or `null` for C's `goto exit` (null space reached, or out of iterations).
|
|
154
|
+
*/
|
|
155
|
+
function iterate(st: PowerState, i: number): number | null {
|
|
156
|
+
const { n, mat, tmpVec, lastVec } = st;
|
|
157
|
+
const curr = st.eigs[i]!;
|
|
158
|
+
let angle: number;
|
|
159
|
+
let len: number;
|
|
160
|
+
st.iteration = 0;
|
|
161
|
+
do {
|
|
162
|
+
st.iteration++;
|
|
163
|
+
copyVector(n, curr, lastVec);
|
|
164
|
+
rightMultWithVectorD(mat, n, n, curr, tmpVec);
|
|
165
|
+
copyVector(n, tmpVec, curr);
|
|
166
|
+
orthogonalize(st, i, curr);
|
|
167
|
+
len = norm(curr, n - 1, BLOCK_NONE);
|
|
168
|
+
if (len < POWER_LENGTH_FLOOR || st.iteration > st.maxIterations) return null;
|
|
169
|
+
vectorsScalarMult(n, curr, 1.0 / len, curr);
|
|
170
|
+
angle = innerProduct(n, curr, lastVec, BLOCK_ROW);
|
|
171
|
+
} while (Math.abs(angle) < st.tol);
|
|
172
|
+
return angle * len;
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
/** The smallest eigenvectors, probably of eigenvalue 0: no power iteration. */
|
|
176
|
+
function fillNullSpace(st: PowerState, from: number, neigs: number): void {
|
|
177
|
+
for (let i = from; i < neigs; i++) {
|
|
178
|
+
const len = guess(st, i);
|
|
179
|
+
vectorsScalarMult(st.n, st.eigs[i]!, 1.0 / len, st.eigs[i]!);
|
|
180
|
+
st.evals[i] = 0;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
|
|
184
|
+
/** Sort the vectors by their evals, for overcoming possible mis-convergence. */
|
|
185
|
+
function sortByEval(st: PowerState, neigs: number): void {
|
|
186
|
+
const { n, eigs, evals, tmpVec } = st;
|
|
187
|
+
for (let i = 0; i < neigs - 1; i++) {
|
|
188
|
+
let largestIndex = i;
|
|
189
|
+
let largestEval = evals[largestIndex]!;
|
|
190
|
+
for (let j = i + 1; j < neigs; j++) {
|
|
191
|
+
if (largestEval < evals[j]!) {
|
|
192
|
+
largestIndex = j;
|
|
193
|
+
largestEval = evals[largestIndex]!;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
if (largestIndex !== i) { // exchange eigenvectors
|
|
197
|
+
copyVector(n, eigs[i]!, tmpVec);
|
|
198
|
+
copyVector(n, eigs[largestIndex]!, eigs[i]!);
|
|
199
|
+
copyVector(n, tmpVec, eigs[largestIndex]!);
|
|
200
|
+
evals[largestIndex] = evals[i]!;
|
|
201
|
+
evals[i] = largestEval;
|
|
202
|
+
}
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
/**
|
|
207
|
+
* Compute the `neigs` top eigenvectors of `mat` by power iteration. Returns
|
|
208
|
+
* false when the last iteration ran out of iterations.
|
|
209
|
+
* @see lib/neatogen/matrix_ops.c:power_iteration
|
|
210
|
+
*/
|
|
211
|
+
export function powerIteration(
|
|
212
|
+
mat: readonly Float64Array[], n: number, neigsIn: number, eigs: readonly Float64Array[],
|
|
213
|
+
): boolean {
|
|
214
|
+
const neigs = neigsIn >= n ? n : neigsIn;
|
|
215
|
+
const st: PowerState = {
|
|
216
|
+
mat, n, eigs, evals: new Float64Array(neigs),
|
|
217
|
+
tmpVec: new Float64Array(n), lastVec: new Float64Array(n),
|
|
218
|
+
maxIterations: 30 * n, tol: 1 - P_ITERATION_THRESHOLD, iteration: 0,
|
|
219
|
+
};
|
|
220
|
+
let i = 0;
|
|
221
|
+
for (; i < neigs; i++) {
|
|
222
|
+
let len = guess(st, i);
|
|
223
|
+
while (len < POWER_LENGTH_FLOOR) len = guess(st, i); // a vector colinear with previous ones
|
|
224
|
+
vectorsScalarMult(n, eigs[i]!, 1.0 / len, eigs[i]!);
|
|
225
|
+
const rayleigh = iterate(st, i);
|
|
226
|
+
if (rayleigh === null) break; // goto exit
|
|
227
|
+
st.evals[i] = rayleigh;
|
|
228
|
+
}
|
|
229
|
+
fillNullSpace(st, i, neigs);
|
|
230
|
+
sortByEval(st, neigs);
|
|
231
|
+
return st.iteration <= st.maxIterations;
|
|
232
|
+
}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
// SPDX-License-Identifier: EPL-2.0
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Principal component analysis of a high-dimensional embedding.
|
|
5
|
+
*
|
|
6
|
+
* @see lib/neatogen/pca.c
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
import { fma } from '../../common/fma.js';
|
|
10
|
+
import { closestPairs2Graph } from './closest.js';
|
|
11
|
+
import { multDenseMatD, multSparseDenseMatTranspose, powerIteration } from './matrix-ops-dense.js';
|
|
12
|
+
|
|
13
|
+
/** `num_pairs` @see lib/neatogen/pca.c */
|
|
14
|
+
const NUM_PAIRS = 4;
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Project the `dim`-D `coords` onto their `newDim` principal axes. `coords[i][k]`
|
|
18
|
+
* products are C `int` arithmetic, which wraps on the oracle's `mul.4s`.
|
|
19
|
+
* @see lib/neatogen/pca.c:PCA_alloc
|
|
20
|
+
*/
|
|
21
|
+
export function pcaAlloc(
|
|
22
|
+
coords: readonly Int32Array[], dim: number, n: number, newCoords: readonly Float64Array[], newDim: number,
|
|
23
|
+
): void {
|
|
24
|
+
const eigs = Array.from({ length: newDim }, () => new Float64Array(dim));
|
|
25
|
+
const DD = Array.from({ length: dim }, () => new Float64Array(dim)); // dim×dim: coords×coordsᵀ
|
|
26
|
+
for (let i = 0; i < dim; i++) {
|
|
27
|
+
for (let j = 0; j <= i; j++) {
|
|
28
|
+
let sum = 0;
|
|
29
|
+
for (let k = 0; k < n; k++) sum += Math.imul(coords[i]![k]!, coords[j]![k]!);
|
|
30
|
+
DD[i]![j] = DD[j]![i] = sum;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
powerIteration(DD, dim, newDim, eigs);
|
|
35
|
+
|
|
36
|
+
for (let j = 0; j < newDim; j++) {
|
|
37
|
+
for (let i = 0; i < n; i++) {
|
|
38
|
+
let sum = 0;
|
|
39
|
+
for (let k = 0; k < dim; k++) sum = fma(coords[k]![i]!, eigs[j]![k]!, sum);
|
|
40
|
+
newCoords[j]![i] = sum;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
/**
|
|
46
|
+
* Given that the first projection of `coords` is `coords[0]`, compute another
|
|
47
|
+
* projection direction that scatters points close in `coords[0]`. Returns false
|
|
48
|
+
* when power iteration did not converge.
|
|
49
|
+
* @see lib/neatogen/pca.c:iterativePCA_1D
|
|
50
|
+
*/
|
|
51
|
+
export function iterativePCA1D(
|
|
52
|
+
coords: readonly Float64Array[], dim: number, n: number, newDirection: Float64Array,
|
|
53
|
+
): boolean {
|
|
54
|
+
// the nodes that were close in coords[0], as a Laplacian
|
|
55
|
+
const laplacian = closestPairs2Graph(coords[0]!, n, NUM_PAIRS * n);
|
|
56
|
+
// coords*Lap*coords^T
|
|
57
|
+
const mat1 = multSparseDenseMatTranspose(laplacian, coords, n, dim);
|
|
58
|
+
const mat = multDenseMatD(coords, mat1, dim, n, dim);
|
|
59
|
+
return powerIteration(mat, dim, 1, [newDirection]);
|
|
60
|
+
}
|
package/src/layout/neato/sgd.ts
CHANGED
|
@@ -17,7 +17,8 @@ import type { RkState } from '../../util/mt19937.js';
|
|
|
17
17
|
import { drand48 } from '../../common/random.js';
|
|
18
18
|
import { lateDouble } from '../../common/nodeinit.js';
|
|
19
19
|
import { checkStart, parseStart, INIT_RANDOM, INIT_REGULAR } from './start.js';
|
|
20
|
-
import {
|
|
20
|
+
import { jitter3d, ndimOf } from './init-dim.js';
|
|
21
|
+
import { agwarningf } from '../../common/agerr.js';
|
|
21
22
|
|
|
22
23
|
// ---------------------------------------------------------------------------
|
|
23
24
|
// Model constants — @see lib/neatogen/defs.h
|
|
@@ -270,20 +271,26 @@ function hasPos(np: Node): boolean {
|
|
|
270
271
|
return np.info.posSet === true || np.info.pinned === true;
|
|
271
272
|
}
|
|
272
273
|
|
|
274
|
+
/** @see lib/neatogen/stuff.c:randompos */
|
|
275
|
+
function randompos(np: Node, nG: number, ndim: number): void {
|
|
276
|
+
np.info.pos = [nG * drand48(), nG * drand48()];
|
|
277
|
+
if (ndim > 2) jitter3d(np, nG, ndim);
|
|
278
|
+
}
|
|
279
|
+
|
|
273
280
|
/**
|
|
274
281
|
* Seed drand48 from `start` (checkStart) and give every node without a
|
|
275
282
|
* position a random one. start=regular keeps the regular placement that
|
|
276
283
|
* solveModel already made (checkStart's INIT_REGULAR early return).
|
|
277
284
|
*
|
|
278
285
|
* @see lib/neatogen/stuff.c:initial_positions
|
|
279
|
-
* @see lib/neatogen/stuff.c:randompos
|
|
280
286
|
*/
|
|
281
287
|
export function initialPositions(g: Graph, nG: number = g.nodes.size): void {
|
|
282
288
|
if (parseStart(g.root.attrs.get('start'), INIT_RANDOM).init === INIT_REGULAR) return;
|
|
283
289
|
checkStart(g, nG, INIT_RANDOM);
|
|
290
|
+
const ndim = ndimOf(g);
|
|
284
291
|
for (const np of g.nodes.values()) {
|
|
285
292
|
if (hasPos(np)) continue;
|
|
286
|
-
np
|
|
293
|
+
randompos(np, 1, ndim);
|
|
287
294
|
}
|
|
288
295
|
}
|
|
289
296
|
|
|
@@ -408,17 +415,11 @@ export function buildUnfixed(g: Graph, n: number): boolean[] {
|
|
|
408
415
|
*/
|
|
409
416
|
export function resolveModel(model: number): number {
|
|
410
417
|
if (model === MODEL_CIRCUIT) {
|
|
411
|
-
|
|
412
|
-
'warn',
|
|
413
|
-
'circuit model not yet supported in Gmode=sgd, reverting to shortpath model',
|
|
414
|
-
);
|
|
418
|
+
agwarningf('circuit model not yet supported in Gmode=sgd, reverting to shortpath model');
|
|
415
419
|
return MODEL_SHORTPATH;
|
|
416
420
|
}
|
|
417
421
|
if (model === MODEL_MDS) {
|
|
418
|
-
|
|
419
|
-
'warn',
|
|
420
|
-
'mds model not yet supported in Gmode=sgd, reverting to shortpath model',
|
|
421
|
-
);
|
|
422
|
+
agwarningf('mds model not yet supported in Gmode=sgd, reverting to shortpath model');
|
|
422
423
|
return MODEL_SHORTPATH;
|
|
423
424
|
}
|
|
424
425
|
return model;
|
|
@@ -449,8 +450,8 @@ export function runSgdLoop(
|
|
|
449
450
|
* MODEL_CIRCUIT and MODEL_MDS are not yet supported and fall back to
|
|
450
451
|
* MODEL_SHORTPATH with a console.warn (matching agwarningf in C).
|
|
451
452
|
*
|
|
452
|
-
*
|
|
453
|
-
* Nodes with `node.info.pinned === true` are not moved.
|
|
453
|
+
* The solver moves x and y only (`node.info.pos` keeps any later coordinate
|
|
454
|
+
* from the initial positions). Nodes with `node.info.pinned === true` are not moved.
|
|
454
455
|
* The shuffle RNG is seeded with 0 as in C; `start` seeds only the initial
|
|
455
456
|
* positions (drand48, via checkStart).
|
|
456
457
|
*
|
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Neato `start` handling (setSeed / initRegular / checkStart) and the
|
|
4
4
|
* fail-loud check for the neato init feature this port does not have (smart
|
|
5
|
-
* init for the stress path). mode=hier runs `stress_majorization_with_hierarchy
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
* takes no smart init.
|
|
5
|
+
* init for the stress path). mode=hier runs `stress_majorization_with_hierarchy`,
|
|
6
|
+
* whose smart init is ported (stress-subspace.ts). mode=ipsep runs
|
|
7
|
+
* `stress_majorization_cola`, which takes no smart init.
|
|
9
8
|
*
|
|
10
9
|
* The loud check sits where neato's C branches into the unported code and
|
|
11
10
|
* fires only for the mode whose C path reaches it (ADR-3).
|
|
@@ -21,6 +20,7 @@ import { registerRenderState } from '../../common/render-state.js';
|
|
|
21
20
|
import {
|
|
22
21
|
MODE_KK, MODE_MAJOR, MODE_HIER, MODE_IPSEP, MODE_SGD,
|
|
23
22
|
} from './init.js';
|
|
23
|
+
import { jitter3d, ndimOf } from './init-dim.js';
|
|
24
24
|
import { agwarningf } from '../../common/agerr.js';
|
|
25
25
|
|
|
26
26
|
/** @see lib/neatogen/neato.h:INIT_SELF */
|
|
@@ -82,10 +82,12 @@ export function parseStart(
|
|
|
82
82
|
|
|
83
83
|
/**
|
|
84
84
|
* Place the nodes on a regular polygon and mark them P_SET (positioned, not
|
|
85
|
-
* pinned), so the stress kernel's initLayout starts from them.
|
|
85
|
+
* pinned), so the stress kernel's initLayout starts from them. Above 2-D the
|
|
86
|
+
* other coordinates are jittered, before checkStart's srand48.
|
|
86
87
|
* @see lib/neatogen/neatoinit.c:initRegular
|
|
87
88
|
*/
|
|
88
89
|
export function initRegular(g: Graph, nG: number): void {
|
|
90
|
+
const ndim = ndimOf(g);
|
|
89
91
|
let a = 0.0;
|
|
90
92
|
const da = (2 * Math.PI) / nG;
|
|
91
93
|
for (const np of g.nodes.values()) {
|
|
@@ -93,6 +95,7 @@ export function initRegular(g: Graph, nG: number): void {
|
|
|
93
95
|
np.info.posSet = true;
|
|
94
96
|
np.info.pinned = false; // C: ND_pinned = P_SET overrides P_PIN
|
|
95
97
|
a += da;
|
|
98
|
+
if (ndim > 2) jitter3d(np, nG, ndim);
|
|
96
99
|
}
|
|
97
100
|
}
|
|
98
101
|
|