@knowvah/dot-engine 2.9.0 → 2.10.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/graph-init.d.ts.map +1 -1
- package/dist/common/htmltable.d.ts +1 -1
- package/dist/common/htmltable.d.ts.map +1 -1
- package/dist/common/poly-init.d.ts +8 -8
- package/dist/common/poly-init.d.ts.map +1 -1
- package/dist/common/safefile.d.ts +15 -0
- package/dist/common/safefile.d.ts.map +1 -1
- package/dist/gvc/image-resolver.d.ts +5 -0
- package/dist/gvc/image-resolver.d.ts.map +1 -1
- package/dist/gvc/usershape.d.ts +2 -0
- package/dist/gvc/usershape.d.ts.map +1 -1
- package/dist/index.js +914 -813
- package/dist/index.js.map +4 -4
- package/dist/layout/neato/__fixtures__/kk-models.d.ts +59 -0
- package/dist/layout/neato/__fixtures__/kk-models.d.ts.map +1 -0
- package/dist/layout/neato/__fixtures__/quad-prog-vpsc.d.ts +6 -0
- package/dist/layout/neato/__fixtures__/quad-prog-vpsc.d.ts.map +1 -1
- package/dist/layout/neato/circuit.d.ts +38 -0
- package/dist/layout/neato/circuit.d.ts.map +1 -1
- package/dist/layout/neato/constrained-majorization.d.ts.map +1 -1
- package/dist/layout/neato/index.d.ts +6 -3
- package/dist/layout/neato/index.d.ts.map +1 -1
- package/dist/layout/neato/init.d.ts.map +1 -1
- package/dist/layout/neato/kk-paths.d.ts +11 -1
- package/dist/layout/neato/kk-paths.d.ts.map +1 -1
- package/dist/layout/neato/kk-solve.d.ts.map +1 -1
- package/dist/layout/neato/kk.d.ts +5 -3
- package/dist/layout/neato/kk.d.ts.map +1 -1
- package/dist/layout/neato/kkutils.d.ts +45 -0
- package/dist/layout/neato/kkutils.d.ts.map +1 -1
- package/dist/layout/neato/start.d.ts +11 -10
- package/dist/layout/neato/start.d.ts.map +1 -1
- package/dist/layout/neato/stress-models.d.ts +25 -19
- package/dist/layout/neato/stress-models.d.ts.map +1 -1
- package/dist/render.js +914 -813
- package/dist/render.js.map +4 -4
- package/dist/vpsc/SweepLine.d.ts +21 -8
- package/dist/vpsc/SweepLine.d.ts.map +1 -1
- package/dist/vpsc/sweepTypes.d.ts +12 -2
- package/dist/vpsc/sweepTypes.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/common/graph-init.ts +5 -1
- package/src/common/htmltable.ts +6 -4
- package/src/common/poly-init.ts +35 -15
- package/src/common/safefile.ts +20 -2
- package/src/gvc/__fixtures__/p8/bad.png +1 -0
- package/src/gvc/__fixtures__/p8/d/r.png +0 -0
- package/src/gvc/__fixtures__/p8/html-img-bad.gv +1 -0
- package/src/gvc/__fixtures__/p8/html-img-bad.svg +19 -0
- package/src/gvc/__fixtures__/p8/html-img-bad.svg.stderr +3 -0
- package/src/gvc/__fixtures__/p8/html-img-bad.xdot +13 -0
- package/src/gvc/__fixtures__/p8/html-img-bad.xdot.stderr +3 -0
- package/src/gvc/__fixtures__/p8/ip-shapefile.gv +1 -0
- package/src/gvc/__fixtures__/p8/ip-shapefile.svg +19 -0
- package/src/gvc/__fixtures__/p8/ip-shapefile.svg.stderr +0 -0
- package/src/gvc/__fixtures__/p8/ip-shapefile.xdot +15 -0
- package/src/gvc/__fixtures__/p8/ip-shapefile.xdot.stderr +0 -0
- package/src/gvc/__fixtures__/p8/regen.sh +13 -0
- package/src/gvc/image-resolver.ts +8 -0
- package/src/gvc/usershape.ts +5 -0
- package/src/layout/neato/__fixtures__/kk-models.ts +82 -0
- package/src/layout/neato/__fixtures__/models/hier-circuit.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-circuit.xdot +92 -0
- package/src/layout/neato/__fixtures__/models/hier-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-default.gv +14 -0
- package/src/layout/neato/__fixtures__/models/hier-default.xdot +91 -0
- package/src/layout/neato/__fixtures__/models/hier-default.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-disc-circuit.gv +9 -0
- package/src/layout/neato/__fixtures__/models/hier-disc-circuit.xdot +54 -0
- package/src/layout/neato/__fixtures__/models/hier-disc-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-len-circuit.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-len-circuit.xdot +97 -0
- package/src/layout/neato/__fixtures__/models/hier-len-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-len-mds.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-len-mds.xdot +97 -0
- package/src/layout/neato/__fixtures__/models/hier-len-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-len-subset.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-len-subset.xdot +97 -0
- package/src/layout/neato/__fixtures__/models/hier-len-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-long-mds.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-long-mds.xdot +95 -0
- package/src/layout/neato/__fixtures__/models/hier-long-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-mds-nolen.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-mds-nolen.xdot +92 -0
- package/src/layout/neato/__fixtures__/models/hier-mds-nolen.xdot.stderr +2 -0
- package/src/layout/neato/__fixtures__/models/hier-pin-disc-circuit.gv +10 -0
- package/src/layout/neato/__fixtures__/models/hier-pin-disc-circuit.xdot +54 -0
- package/src/layout/neato/__fixtures__/models/hier-pin-disc-circuit.xdot.stderr +3 -0
- package/src/layout/neato/__fixtures__/models/hier-shortpath.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-shortpath.xdot +92 -0
- package/src/layout/neato/__fixtures__/models/hier-shortpath.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/hier-subset.gv +15 -0
- package/src/layout/neato/__fixtures__/models/hier-subset.xdot +92 -0
- package/src/layout/neato/__fixtures__/models/hier-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-circuit.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-circuit.xdot +81 -0
- package/src/layout/neato/__fixtures__/models/kk-circuit.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-default.gv +14 -0
- package/src/layout/neato/__fixtures__/models/kk-default.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/kk-default.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit-pack.gv +10 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit-pack.native-crash +1 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit-pack.xdot +0 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit-pack.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit.gv +9 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit.xdot +49 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-circuit.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-shortpath-pack.gv +10 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-shortpath-pack.xdot +50 -0
- package/src/layout/neato/__fixtures__/models/kk-disc-shortpath-pack.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-circuit-pack.gv +13 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-circuit-pack.native-crash +1 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-circuit-pack.xdot +0 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-circuit-pack.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-shortpath-pack.gv +13 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-shortpath-pack.xdot +66 -0
- package/src/layout/neato/__fixtures__/models/kk-disc4-shortpath-pack.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-circuit.gv +11 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-circuit.xdot +51 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-circuit.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-circuit.gv +11 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-circuit.xdot +57 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-circuit.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-mds.gv +11 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-mds.xdot +57 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-len-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-long-mds.gv +11 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-long-mds.xdot +57 -0
- package/src/layout/neato/__fixtures__/models/kk-iso-long-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-large.gv +203 -0
- package/src/layout/neato/__fixtures__/models/kk-large.pow.json +1088 -0
- package/src/layout/neato/__fixtures__/models/kk-large.xdot +1208 -0
- package/src/layout/neato/__fixtures__/models/kk-large.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-len-circuit.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-len-circuit.xdot +86 -0
- package/src/layout/neato/__fixtures__/models/kk-len-circuit.xdot.stderr +4 -0
- package/src/layout/neato/__fixtures__/models/kk-len-mds.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-len-mds.xdot +86 -0
- package/src/layout/neato/__fixtures__/models/kk-len-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-len-subset.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-len-subset.xdot +86 -0
- package/src/layout/neato/__fixtures__/models/kk-len-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-mds-nolen.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-mds-nolen.xdot +81 -0
- package/src/layout/neato/__fixtures__/models/kk-mds-nolen.xdot.stderr +2 -0
- package/src/layout/neato/__fixtures__/models/kk-shortpath.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-shortpath.xdot +81 -0
- package/src/layout/neato/__fixtures__/models/kk-shortpath.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/kk-subset.gv +15 -0
- package/src/layout/neato/__fixtures__/models/kk-subset.xdot +81 -0
- package/src/layout/neato/__fixtures__/models/kk-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/large-circuit.gv +203 -0
- package/src/layout/neato/__fixtures__/models/large-circuit.xdot +1208 -0
- package/src/layout/neato/__fixtures__/models/large-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-circuit.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-circuit.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-default.gv +13 -0
- package/src/layout/neato/__fixtures__/models/major-default.xdot +79 -0
- package/src/layout/neato/__fixtures__/models/major-default.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-disc-circuit.gv +8 -0
- package/src/layout/neato/__fixtures__/models/major-disc-circuit.xdot +48 -0
- package/src/layout/neato/__fixtures__/models/major-disc-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-len-circuit.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-len-circuit.xdot +85 -0
- package/src/layout/neato/__fixtures__/models/major-len-circuit.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-len-mds.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-len-mds.xdot +85 -0
- package/src/layout/neato/__fixtures__/models/major-len-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-len-subset.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-len-subset.xdot +85 -0
- package/src/layout/neato/__fixtures__/models/major-len-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-long-mds.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-long-mds.xdot +83 -0
- package/src/layout/neato/__fixtures__/models/major-long-mds.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-long-shortpath.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-long-shortpath.xdot +83 -0
- package/src/layout/neato/__fixtures__/models/major-long-shortpath.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-mds-edge-default.gv +15 -0
- package/src/layout/neato/__fixtures__/models/major-mds-edge-default.xdot +81 -0
- package/src/layout/neato/__fixtures__/models/major-mds-edge-default.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen-anon.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen-anon.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen-anon.xdot.stderr +2 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-mds-nolen.xdot.stderr +2 -0
- package/src/layout/neato/__fixtures__/models/major-model-Subset.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-model-Subset.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-model-Subset.xdot.stderr +1 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo-anon.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo-anon.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo-anon.xdot.stderr +1 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-model-foo.xdot.stderr +1 -0
- package/src/layout/neato/__fixtures__/models/major-pin-disc-circuit.gv +9 -0
- package/src/layout/neato/__fixtures__/models/major-pin-disc-circuit.xdot +48 -0
- package/src/layout/neato/__fixtures__/models/major-pin-disc-circuit.xdot.stderr +2 -0
- package/src/layout/neato/__fixtures__/models/major-shortpath.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-shortpath.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-shortpath.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/major-subset.gv +14 -0
- package/src/layout/neato/__fixtures__/models/major-subset.xdot +80 -0
- package/src/layout/neato/__fixtures__/models/major-subset.xdot.stderr +0 -0
- package/src/layout/neato/__fixtures__/models/regen.sh +46 -0
- package/src/layout/neato/__fixtures__/quad-prog-vpsc.ts +7 -1
- package/src/layout/neato/circuit.ts +67 -2
- package/src/layout/neato/constrained-majorization.ts +5 -22
- package/src/layout/neato/index.ts +41 -14
- package/src/layout/neato/init.ts +9 -13
- package/src/layout/neato/kk-paths.ts +23 -1
- package/src/layout/neato/kk-solve.ts +5 -3
- package/src/layout/neato/kk.ts +53 -21
- package/src/layout/neato/kkutils.ts +108 -3
- package/src/layout/neato/start.ts +20 -65
- package/src/layout/neato/stress-models.ts +55 -59
- package/src/layout/pack/index.ts +2 -2
- package/src/vpsc/SweepLine.ts +39 -26
- package/src/vpsc/sweepTypes.ts +13 -2
|
@@ -25,6 +25,8 @@ import {
|
|
|
25
25
|
MODEL_MDS,
|
|
26
26
|
} from './init.js';
|
|
27
27
|
import { neatoMode } from './start.js';
|
|
28
|
+
import { agerr, agwarningf } from '../../common/agerr.js';
|
|
29
|
+
import { agNameOf } from '../../model/cgraph-ops.js';
|
|
28
30
|
import { removeOverlapWith, graphAdjustMode, type AdjustData } from './fdp-adjust.js';
|
|
29
31
|
import { splineEdgesShifted, EDGETYPE_LINE } from './splines.js';
|
|
30
32
|
import { setEdgeTypeFromAttr } from '../dot/index.js';
|
|
@@ -74,25 +76,50 @@ export function parseMode(g: Graph): number {
|
|
|
74
76
|
// Model parsing
|
|
75
77
|
// ---------------------------------------------------------------------------
|
|
76
78
|
|
|
77
|
-
/**
|
|
78
|
-
const
|
|
79
|
-
shortpath: MODEL_SHORTPATH,
|
|
80
|
-
circuit: MODEL_CIRCUIT,
|
|
81
|
-
subset: MODEL_SUBSET,
|
|
82
|
-
mds: MODEL_MDS,
|
|
83
|
-
};
|
|
79
|
+
/** Edge attribute whose declaration lets `model=mds` stand. @see lib/neatogen/neatoinit.c:neatoModel */
|
|
80
|
+
const EDGE_LEN_ATTR = 'len';
|
|
84
81
|
|
|
85
82
|
/**
|
|
86
|
-
*
|
|
87
|
-
*
|
|
83
|
+
* C's `agattr_text(g, AGEDGE, "len", 0)` lookup: true when the edge attribute
|
|
84
|
+
* `len` has been declared anywhere in the root graph's dictionary. cgraph
|
|
85
|
+
* declares it by an `edge [len=...]` default in the root or any subgraph (even
|
|
86
|
+
* with no edge to use it) and by any edge carrying `len=`; the port keeps those
|
|
87
|
+
* three places apart, so this walks all of them. Native-verified: an
|
|
88
|
+
* `edge [len=2]` in a subgraph with no edges, or in a graph with no edges at
|
|
89
|
+
* all, suppresses the warning; `node [len=2]` does not.
|
|
88
90
|
*
|
|
89
|
-
* @see lib/neatogen/
|
|
91
|
+
* @see lib/neatogen/neatoinit.c:neatoModel (agattr_text lookup)
|
|
92
|
+
*/
|
|
93
|
+
function edgeLenDeclared(g: Graph): boolean {
|
|
94
|
+
if (g.edgeDefaults.has(EDGE_LEN_ATTR)) return true;
|
|
95
|
+
for (const e of g.edges) if (e.attrs.has(EDGE_LEN_ATTR)) return true;
|
|
96
|
+
for (const sub of g.subgraphs.values()) if (edgeLenDeclared(sub)) return true;
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
/**
|
|
101
|
+
* Parse the root `model` attribute into a numeric model constant (init.ts
|
|
102
|
+
* numbering). Unset or empty is MODEL_SHORTPATH; `circuit`, `subset` and
|
|
103
|
+
* `shortpath` match case-sensitively. `mds` stands only when the edge attribute
|
|
104
|
+
* `len` is declared, else it warns and reverts to MODEL_SHORTPATH; any other
|
|
105
|
+
* value warns and is ignored. Call once, where neato_layout does.
|
|
106
|
+
*
|
|
107
|
+
* @see lib/neatogen/neatoinit.c:neatoModel (605-627)
|
|
90
108
|
*/
|
|
91
109
|
export function parseModel(g: Graph): number {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
if (
|
|
95
|
-
|
|
110
|
+
const p = g.attrs.get('model');
|
|
111
|
+
if (p === undefined || p === '') return MODEL_SHORTPATH;
|
|
112
|
+
if (p === 'circuit') return MODEL_CIRCUIT;
|
|
113
|
+
if (p === 'subset') return MODEL_SUBSET;
|
|
114
|
+
if (p === 'shortpath') return MODEL_SHORTPATH;
|
|
115
|
+
if (p === 'mds') {
|
|
116
|
+
if (edgeLenDeclared(g)) return MODEL_MDS;
|
|
117
|
+
agwarningf(`edges in graph ${agNameOf(g.root)} have no len attribute. Hence, the mds model`);
|
|
118
|
+
agerr('prev', 'is inappropriate. Reverting to the shortest path model.');
|
|
119
|
+
return MODEL_SHORTPATH;
|
|
120
|
+
}
|
|
121
|
+
agwarningf(`Unknown value ${p} for attribute "model" in graph ${agNameOf(g.root)} - ignored`);
|
|
122
|
+
return MODEL_SHORTPATH;
|
|
96
123
|
}
|
|
97
124
|
|
|
98
125
|
// ---------------------------------------------------------------------------
|
package/src/layout/neato/init.ts
CHANGED
|
@@ -39,11 +39,8 @@ import { agerr } from '../../common/agerr.js';
|
|
|
39
39
|
|
|
40
40
|
export { makeGraphDataC, graphHasLen, checkStart };
|
|
41
41
|
import { mapbool } from '../dot/rank.js';
|
|
42
|
-
import {
|
|
43
|
-
|
|
44
|
-
computeWeightedApspPacked,
|
|
45
|
-
stressMajorizationKDMkernel,
|
|
46
|
-
} from './stress-kernel.js';
|
|
42
|
+
import { stressMajorizationKDMkernel } from './stress-kernel.js';
|
|
43
|
+
import { stressModelDij } from './stress-models.js';
|
|
47
44
|
import { lateDouble } from '../../common/nodeinit.js';
|
|
48
45
|
import { inputscaleDivisor } from '../../common/utils-inputscale.js';
|
|
49
46
|
import { parseNeatoDrawing, neatoSetAspectRatio } from './set-aspect.js';
|
|
@@ -326,7 +323,6 @@ interface MajorizationCtx {
|
|
|
326
323
|
readonly g: Graph;
|
|
327
324
|
readonly mode: number;
|
|
328
325
|
readonly model: number;
|
|
329
|
-
readonly haveLen: boolean;
|
|
330
326
|
/** `opt_*` bits from `checkExp` and `checkStart`. */
|
|
331
327
|
readonly opts: number;
|
|
332
328
|
/** The layout's resolved overlap mode (C's `am`). */
|
|
@@ -342,7 +338,7 @@ interface MajorizationCtx {
|
|
|
342
338
|
function solveStress(
|
|
343
339
|
c: MajorizationCtx, vtx: DirectedVtxData[], dCoords: Float64Array[], nodeList: Node[],
|
|
344
340
|
): number {
|
|
345
|
-
const { g, mode, model,
|
|
341
|
+
const { g, mode, model, opts } = c;
|
|
346
342
|
const n = nodeList.length;
|
|
347
343
|
const maxi = neatoMaxIter(g.attrs.get('maxiter'), mode, n);
|
|
348
344
|
const epsilon = lateDouble(g.attrs.get('epsilon'), 1e-4, 0); // DFLT_TOLERANCE
|
|
@@ -358,8 +354,7 @@ function solveStress(
|
|
|
358
354
|
dim: DFLT_DIM, model, maxi, epsilon, opt,
|
|
359
355
|
});
|
|
360
356
|
}
|
|
361
|
-
|
|
362
|
-
const Dij = haveLen ? computeWeightedApspPacked(vtx, n) : computeApspPacked(vtx, n);
|
|
357
|
+
const Dij = stressModelDij(vtx, n, model); // inside kD_mkernel in C (AD-2)
|
|
363
358
|
return stressMajorizationKDMkernel(Dij, n, dCoords, nodeList, {
|
|
364
359
|
dim: DFLT_DIM, opts, maxi, epsilon,
|
|
365
360
|
});
|
|
@@ -370,14 +365,14 @@ export function runMajorization(g: Graph, mode: number, model: number, am: Adjus
|
|
|
370
365
|
const nodeList = assignNodeIds(g);
|
|
371
366
|
setEdgeLen(g); // scan_graph_mode else-branch: ED_dist for major/hier/ipsep
|
|
372
367
|
const n = nodeList.length;
|
|
373
|
-
const haveLen = graphHasLen(g);
|
|
368
|
+
const haveLen = model !== MODEL_SUBSET && graphHasLen(g); // unused in reweight model, neatoinit.c:763
|
|
374
369
|
// C: srand48(seed) immediately before initLayout draws; hier starts from self
|
|
375
370
|
const init = checkStart(g, n, mode === MODE_HIER ? INIT_SELF : INIT_RANDOM);
|
|
376
371
|
const opts = checkExp(g) | (init === INIT_SELF ? STRESS_OPT_SMART_INIT : 0);
|
|
377
372
|
const haveDir = mode === MODE_HIER || mode === MODE_IPSEP;
|
|
378
373
|
const vtx = makeGraphDataC(g, nodeList, haveLen, haveDir, mode);
|
|
379
374
|
const dCoords = [new Float64Array(n), new Float64Array(n)];
|
|
380
|
-
if (solveStress({ g, mode, model,
|
|
375
|
+
if (solveStress({ g, mode, model, opts, am }, vtx, dCoords, nodeList) < 0) {
|
|
381
376
|
agerr('prev', 'layout aborted');
|
|
382
377
|
return;
|
|
383
378
|
}
|
|
@@ -393,8 +388,9 @@ const NO_ADJUST: AdjustData = { mode: AM_NONE, print: 'none', value: 0 };
|
|
|
393
388
|
export function solveModel(
|
|
394
389
|
g: Graph, mode: number, model: number, am: AdjustData = NO_ADJUST,
|
|
395
390
|
): void {
|
|
396
|
-
|
|
397
|
-
|
|
391
|
+
const nG = g.nodes.size;
|
|
392
|
+
if (nG < 2 || neatoMaxIter(g.attrs.get('maxiter'), mode, nG) < 0) return; // neatoinit.c:1290
|
|
393
|
+
assertSupported(g, mode);
|
|
398
394
|
if (mode === MODE_KK) return kkNeato(g, g.nodes.size, model);
|
|
399
395
|
if (mode === MODE_SGD) {
|
|
400
396
|
// C initial_positions -> checkStart: regular positions are kept
|
|
@@ -2,15 +2,20 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* Kamada-Kawai ideal-distance setup: Dijkstra over edge lengths with C's
|
|
4
4
|
* binary heap (`neato_enqueue`/`neato_dequeue`, `shortest_path`, `s1`,
|
|
5
|
-
* `make_spring`) and `mds_model`.
|
|
5
|
+
* `make_spring`), `subset_model` and `mds_model`.
|
|
6
6
|
*
|
|
7
7
|
* The C keeps the heap, its size and the source node in file-statics and the
|
|
8
8
|
* per-node `ND_dist`/`ND_hops`/`ND_heapindex` in node records; here they live
|
|
9
9
|
* in one {@link PathState} per run (no module state), indexed by `ND_id`.
|
|
10
10
|
*
|
|
11
11
|
* @see lib/neatogen/stuff.c
|
|
12
|
+
* @see lib/neatogen/neatoinit.c
|
|
12
13
|
*/
|
|
13
14
|
|
|
15
|
+
import type { Graph } from '../../model/graph.js';
|
|
16
|
+
import { computeApspArtificialWeights } from './kkutils.js';
|
|
17
|
+
import { makeGraphDataC } from './make-graph-data.js';
|
|
18
|
+
|
|
14
19
|
/** One neighbour of a node: its id and the edge's `ED_dist`. */
|
|
15
20
|
export interface Neighbour {
|
|
16
21
|
readonly id: number;
|
|
@@ -130,6 +135,23 @@ export function shortestPath(s: PathState): void {
|
|
|
130
135
|
for (let v = 0; v < s.n; v++) s1(s, v);
|
|
131
136
|
}
|
|
132
137
|
|
|
138
|
+
/**
|
|
139
|
+
* Overwrite `GD_dist` (flat, nG*nG) with the artificial-weight distances.
|
|
140
|
+
* `makeGraphDataC` with neither `len` nor direction builds the rows of C's
|
|
141
|
+
* `makeGraphData(MODE_KK, MODEL_SUBSET)`; it reads `ND_id`, which
|
|
142
|
+
* `scan_graph_mode` has set.
|
|
143
|
+
* @see lib/neatogen/neatoinit.c:subset_model
|
|
144
|
+
*/
|
|
145
|
+
export function subsetModel(g: Graph, nG: number, dist: Float64Array): void {
|
|
146
|
+
const gp = makeGraphDataC(g, [...g.nodes.values()], false, false);
|
|
147
|
+
const Dij = computeApspArtificialWeights(gp, nG);
|
|
148
|
+
for (let i = 0; i < nG; i++) {
|
|
149
|
+
for (let j = 0; j < nG; j++) {
|
|
150
|
+
dist[i * nG + j] = Dij[i]![j]!;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
|
|
133
155
|
/**
|
|
134
156
|
* Overwrite `GD_dist` with edge lengths. C indexes the matrix with `AGSEQ`
|
|
135
157
|
* (1-based), so the last node's row falls outside the n*n allocation (heap
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
* @see lib/neatogen/solve.c
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
+
import { fms } from '../../common/fma.js';
|
|
10
|
+
|
|
9
11
|
/** Pivots below this make the system ill-conditioned. @see solve.c:solve */
|
|
10
12
|
const MIN_PIVOT = 1.0e-10;
|
|
11
13
|
|
|
@@ -31,8 +33,8 @@ function eliminate(a: Float64Array, c: Float64Array, n: number, i: number): bool
|
|
|
31
33
|
swap(c, istar, i);
|
|
32
34
|
for (let ii = i + 1; ii < n; ii++) {
|
|
33
35
|
const pivot = a[ii * n + i]! / a[i * n + i]!;
|
|
34
|
-
c[ii]
|
|
35
|
-
for (let j = 0; j < n; j++) a[ii * n + j] = a[
|
|
36
|
+
c[ii] = fms(pivot, c[i]!, c[ii]!);
|
|
37
|
+
for (let j = 0; j < n; j++) a[ii * n + j] = fms(pivot, a[i * n + j]!, a[ii * n + j]!);
|
|
36
38
|
}
|
|
37
39
|
return true;
|
|
38
40
|
}
|
|
@@ -56,7 +58,7 @@ export function solve(a: Float64Array, b: Float64Array, c: Float64Array, n: numb
|
|
|
56
58
|
for (let k = 0; k < n - 1; k++) {
|
|
57
59
|
const m = n - k - 2;
|
|
58
60
|
b[m] = c[m]!;
|
|
59
|
-
for (let j = m + 1; j < n; j++) b[m]
|
|
61
|
+
for (let j = m + 1; j < n; j++) b[m] = fms(a[m * n + j]!, b[j]!, b[m]!);
|
|
60
62
|
b[m]! /= a[m * n + m]!;
|
|
61
63
|
}
|
|
62
64
|
c.set(csave);
|
package/src/layout/neato/kk.ts
CHANGED
|
@@ -9,6 +9,10 @@
|
|
|
9
9
|
* typed arrays here; the file-statics (`Epsilon`, `Damping`, `MaxIter`,
|
|
10
10
|
* `Initial_dist`) are fields of one {@link KkState} per run.
|
|
11
11
|
*
|
|
12
|
+
* The oracle's clang contracts `a + b*c` within one statement
|
|
13
|
+
* (`-ffp-contract=on`), so those sites go through `fma`/`fms`. The Newton step's
|
|
14
|
+
* iteration count depends on these last bits.
|
|
15
|
+
*
|
|
12
16
|
* Not ported: `Verbose` output (`total_e`, timers), `test_toggle` tracing,
|
|
13
17
|
* and `Reduce` (`-x`, a command-line flag this library has no counterpart for).
|
|
14
18
|
*
|
|
@@ -23,12 +27,14 @@ import type { Edge } from '../../model/edge.js';
|
|
|
23
27
|
import { buildOutEdgeIndex } from '../../model/node.js';
|
|
24
28
|
import { drand48 } from '../../common/random.js';
|
|
25
29
|
import { lateDouble } from '../../common/nodeinit.js';
|
|
26
|
-
import { checkStart, INIT_RANDOM, INIT_REGULAR } from './start.js';
|
|
27
|
-
import { MODEL_MDS } from './init.js';
|
|
30
|
+
import { checkStart, INIT_RANDOM, INIT_REGULAR, INIT_SELF, warnStartSelfOnce } from './start.js';
|
|
31
|
+
import { MODEL_CIRCUIT, MODEL_MDS, MODEL_SUBSET } from './init.js';
|
|
32
|
+
import { circuitModel } from './circuit.js';
|
|
28
33
|
import { solve } from './kk-solve.js';
|
|
29
34
|
import { lenattr } from './edge-len.js';
|
|
30
|
-
import { newPathState, shortestPath, mdsModel, type Neighbour } from './kk-paths.js';
|
|
31
|
-
import { agwarningf } from '../../common/agerr.js';
|
|
35
|
+
import { newPathState, shortestPath, mdsModel, subsetModel, type Neighbour } from './kk-paths.js';
|
|
36
|
+
import { agerr, agwarningf } from '../../common/agerr.js';
|
|
37
|
+
import { fma, fms } from '../../common/fma.js';
|
|
32
38
|
|
|
33
39
|
/** `Ndim`: layout dimension (this port lays out in 2-D only). */
|
|
34
40
|
const NDIM = 2;
|
|
@@ -89,7 +95,7 @@ function initialDist(g: Graph, total: number, epsilon: number): number {
|
|
|
89
95
|
const str = g.attrs.get('defaultdist');
|
|
90
96
|
if (str !== undefined && str !== '') return Math.max(epsilon, parseFloat(str) || 0);
|
|
91
97
|
const nE = g.edges.length;
|
|
92
|
-
return (total / (nE > 0 ? nE : 1)
|
|
98
|
+
return fma(total / (nE > 0 ? nE : 1), Math.sqrt(g.nodes.size), 1);
|
|
93
99
|
}
|
|
94
100
|
|
|
95
101
|
/** `getdouble(G, "epsilon", &Epsilon)`. @see lib/common/utils.c:getdouble */
|
|
@@ -146,7 +152,7 @@ function randompos(np: Node): void {
|
|
|
146
152
|
function initialPositions(g: Graph, st: KkState): void {
|
|
147
153
|
const init = checkStart(g, st.n, INIT_RANDOM);
|
|
148
154
|
if (init === INIT_REGULAR) return;
|
|
149
|
-
|
|
155
|
+
if (init === INIT_SELF) warnStartSelfOnce();
|
|
150
156
|
for (const np of st.nodes) {
|
|
151
157
|
if (np.info.posSet === true || np.info.pinned === true) continue;
|
|
152
158
|
randompos(np);
|
|
@@ -158,7 +164,7 @@ function distvec(p0: number[], p1: number[], del: Float64Array): number {
|
|
|
158
164
|
let dist = 0.0;
|
|
159
165
|
for (let k = 0; k < NDIM; k++) {
|
|
160
166
|
del[k] = p0[k]! - p1[k]!;
|
|
161
|
-
dist
|
|
167
|
+
dist = fma(del[k]!, del[k]!, dist);
|
|
162
168
|
}
|
|
163
169
|
return Math.sqrt(dist);
|
|
164
170
|
}
|
|
@@ -241,14 +247,15 @@ function d2e(st: KkState, m: number, M: Float64Array): void {
|
|
|
241
247
|
let sq = 0.0;
|
|
242
248
|
for (let k = 0; k < NDIM; k++) {
|
|
243
249
|
t[k] = vn.info.pos![k]! - vi.info.pos![k]!;
|
|
244
|
-
sq
|
|
250
|
+
sq = fma(t[k]!, t[k]!, sq);
|
|
245
251
|
}
|
|
246
252
|
const scale = 1 / Math.pow(sq, 1.5);
|
|
247
253
|
const K = st.spring[m * n + i]!;
|
|
248
254
|
const D = st.dist[m * n + i]!;
|
|
249
255
|
for (let k = 0; k < NDIM; k++) {
|
|
250
|
-
for (let l = 0; l < k; l++) M[l * NDIM + k]
|
|
251
|
-
|
|
256
|
+
for (let l = 0; l < k; l++) M[l * NDIM + k] = fma(K * D * t[k]! * t[l]!, scale, M[l * NDIM + k]!);
|
|
257
|
+
const inner = fms(D * fms(t[k]!, t[k]!, sq), scale, 1.0);
|
|
258
|
+
M[k * NDIM + k] = fma(K, inner, M[k * NDIM + k]!);
|
|
252
259
|
}
|
|
253
260
|
}
|
|
254
261
|
for (let k = 1; k < NDIM; k++) {
|
|
@@ -264,7 +271,7 @@ function chooseNode(st: KkState): number {
|
|
|
264
271
|
for (let i = 0; i < st.n; i++) {
|
|
265
272
|
if (st.nodes[i]!.info.pinned === true) continue;
|
|
266
273
|
let m = 0.0;
|
|
267
|
-
for (let k = 0; k < NDIM; k++) m
|
|
274
|
+
for (let k = 0; k < NDIM; k++) m = fma(st.sumT[i * NDIM + k]!, st.sumT[i * NDIM + k]!, m);
|
|
268
275
|
if (m > max) { choice = i; max = m; }
|
|
269
276
|
}
|
|
270
277
|
return max < st.epsilon * st.epsilon ? -1 : choice;
|
|
@@ -280,7 +287,7 @@ function moveNode(st: KkState, m: number): void {
|
|
|
280
287
|
solve(a, b, c, NDIM);
|
|
281
288
|
const pos = st.nodes[m]!.info.pos!;
|
|
282
289
|
for (let i = 0; i < NDIM; i++) {
|
|
283
|
-
b[i] = (
|
|
290
|
+
b[i] = fma(2 * (1 - st.damping), drand48(), st.damping) * b[i]!;
|
|
284
291
|
pos[i]! += b[i]!;
|
|
285
292
|
}
|
|
286
293
|
st.move++;
|
|
@@ -306,19 +313,44 @@ function mdsEdges(
|
|
|
306
313
|
}
|
|
307
314
|
|
|
308
315
|
/**
|
|
309
|
-
*
|
|
310
|
-
*
|
|
311
|
-
*
|
|
316
|
+
* The distance-model dispatch at the head of `kkNeato`. The warning comes from
|
|
317
|
+
* `circuit_model`'s failure, which on the 1-based `AGSEQ` is every graph (see
|
|
318
|
+
* `circuit.ts`), so a connected graph prints "is disconnected" too; and under
|
|
319
|
+
* `pack` it prints once per component, under the component's own name.
|
|
320
|
+
* @see lib/neatogen/neatoinit.c:kkNeato (neatoinit.c:1243-1261)
|
|
321
|
+
*/
|
|
322
|
+
function kkModel(g: Graph, nG: number, model: number, run: ReturnType<typeof scanGraphMode>): void {
|
|
323
|
+
const { st, adj, ini, lens } = run;
|
|
324
|
+
const shortest = (): void => shortestPath(newPathState(st.n, st.dist, adj, ini));
|
|
325
|
+
if (model === MODEL_SUBSET) {
|
|
326
|
+
subsetModel(g, nG, st.dist);
|
|
327
|
+
} else if (model === MODEL_CIRCUIT) {
|
|
328
|
+
if (!circuitModel(g, nG, st.dist, lens)) {
|
|
329
|
+
agwarningf(`graph ${agNameOf(g)} is disconnected. Hence, the circuit model`);
|
|
330
|
+
agerr('prev', 'is undefined. Reverting to the shortest path model.');
|
|
331
|
+
agerr('prev', 'Alternatively, consider running neato using -Gpack=true or decomposing');
|
|
332
|
+
agerr('prev', 'the graph into connected components.');
|
|
333
|
+
shortest();
|
|
334
|
+
}
|
|
335
|
+
} else if (model === MODEL_MDS) {
|
|
336
|
+
shortest();
|
|
337
|
+
mdsModel(st.dist, st.n, mdsEdges(g, st.nodes, lens));
|
|
338
|
+
} else {
|
|
339
|
+
shortest();
|
|
340
|
+
}
|
|
341
|
+
}
|
|
342
|
+
|
|
343
|
+
/**
|
|
344
|
+
* Solve the layout with Kamada-Kawai gradient descent.
|
|
312
345
|
* @see lib/neatogen/neatoinit.c:kkNeato
|
|
313
346
|
*/
|
|
314
347
|
export function kkNeato(g: Graph, nG: number, model: number): void {
|
|
315
348
|
const maxiter = g.attrs.get('maxiter');
|
|
316
349
|
const maxIter = maxiter !== undefined ? atoi(maxiter) : ITERATIONS_PER_NODE * g.nodes.size;
|
|
317
350
|
if (nG < 2 || maxIter < 0) return;
|
|
318
|
-
const
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
solveModel(g, st);
|
|
351
|
+
const run = scanGraphMode(g, maxIter);
|
|
352
|
+
kkModel(g, nG, model, run);
|
|
353
|
+
initialPositions(g, run.st);
|
|
354
|
+
diffeqModel(g, run.st);
|
|
355
|
+
solveModel(g, run.st);
|
|
324
356
|
}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
// SPDX-License-Identifier: EPL-2.0
|
|
2
2
|
|
|
3
3
|
/**
|
|
4
|
-
* Helpers of neatogen/kkutils.c: the all-pairs
|
|
5
|
-
* (`compute_apsp
|
|
6
|
-
*
|
|
4
|
+
* Helpers of neatogen/kkutils.c: the neighbour-vector helpers, the all-pairs
|
|
5
|
+
* shortest-path matrices (`compute_apsp`, `compute_apsp_artificial_weights`),
|
|
6
|
+
* the reweighting they use (`compute_new_weights`, `restore_old_weights`) and
|
|
7
|
+
* the index sorts `quicksort_place` and `quicksort_placef`. The sorts go through `gv_sort`, i.e. libc `qsort`, which is
|
|
7
8
|
* not stable: tied keys keep the permutation the BSD/Apple qsort gives, so the
|
|
8
9
|
* sort runs through `gvQsort` (the reproduction of that algorithm).
|
|
9
10
|
*
|
|
@@ -16,6 +17,46 @@ import { bfs } from './bfs.js';
|
|
|
16
17
|
import { ngdijkstra } from './dijkstra.js';
|
|
17
18
|
import type { VtxData } from './dijkstra.js';
|
|
18
19
|
|
|
20
|
+
/** 2^64: C `size_t` arithmetic wraps modulo this. */
|
|
21
|
+
const SIZE_T_MODULUS = 2 ** 64;
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* Count the neighbours of `u` marked in `vVector`.
|
|
25
|
+
* @see lib/neatogen/kkutils.c:common_neighbors
|
|
26
|
+
*/
|
|
27
|
+
export function commonNeighbors(graph: readonly VtxData[], u: number, vVector: Int32Array): number {
|
|
28
|
+
// count number of common neighbors of 'v_vector' and 'u'
|
|
29
|
+
let numSharedNeighbors = 0;
|
|
30
|
+
for (let j = 1; j < graph[u]!.nedges; j++) {
|
|
31
|
+
const neighbor = graph[u]!.edges[j]!;
|
|
32
|
+
if (vVector[neighbor]! > 0) {
|
|
33
|
+
// a shared neighbor
|
|
34
|
+
numSharedNeighbors++;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return numSharedNeighbors;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Mark the neighbours of `vtx` (a node is NOT a neighbour of itself).
|
|
42
|
+
* @see lib/neatogen/kkutils.c:fill_neighbors_vec_unweighted
|
|
43
|
+
*/
|
|
44
|
+
export function fillNeighborsVecUnweighted(graph: readonly VtxData[], vtx: number, vtxVec: Int32Array): void {
|
|
45
|
+
for (let j = 1; j < graph[vtx]!.nedges; j++) {
|
|
46
|
+
vtxVec[graph[vtx]!.edges[j]!] = 1;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* Clear the marks set by `fillNeighborsVecUnweighted`.
|
|
52
|
+
* @see lib/neatogen/kkutils.c:empty_neighbors_vec
|
|
53
|
+
*/
|
|
54
|
+
export function emptyNeighborsVec(graph: readonly VtxData[], vtx: number, vtxVec: Int32Array): void {
|
|
55
|
+
for (let j = 1; j < graph[vtx]!.nedges; j++) {
|
|
56
|
+
vtxVec[graph[vtx]!.edges[j]!] = 0;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
19
60
|
/** Three-way compare of two keys; 0 on tie or NaN, as C's `<`/`>` chain. */
|
|
20
61
|
function compareKeys(a: number, b: number): number {
|
|
21
62
|
if (a < b) return -1;
|
|
@@ -94,3 +135,67 @@ function computeApspSimple(graph: VtxData[], n: number): Int32Array[] {
|
|
|
94
135
|
export function computeApsp(graph: VtxData[], n: number): Int32Array[] {
|
|
95
136
|
return graph[0]!.ewgts.length > 0 ? computeApspDijkstra(graph, n) : computeApspSimple(graph, n);
|
|
96
137
|
}
|
|
138
|
+
|
|
139
|
+
/**
|
|
140
|
+
* The artificial weight of edge (i, neighbor): `deg_i + deg_j - 2 * common`
|
|
141
|
+
* in C `size_t`, so a negative value (only possible with duplicate
|
|
142
|
+
* neighbours) wraps modulo 2^64 before the (float) cast.
|
|
143
|
+
* @see lib/neatogen/kkutils.c:compute_new_weights (kkutils.c:186-188)
|
|
144
|
+
* @see lib/neatogen/stress.c:compute_apsp_artificial_weights_packed (stress.c:735-736, 752-753)
|
|
145
|
+
*/
|
|
146
|
+
export function artificialWeight(graph: readonly VtxData[], degI: number, neighbor: number, vtxVec: Int32Array): number {
|
|
147
|
+
const degJ = graph[neighbor]!.nedges - 1;
|
|
148
|
+
const w = degI + degJ - 2 * commonNeighbors(graph, neighbor, vtxVec);
|
|
149
|
+
return Math.fround(w < 0 ? w + SIZE_T_MODULUS : w);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
/**
|
|
153
|
+
* Reweight the graph so that high degree nodes will be separated. C walks a
|
|
154
|
+
* pointer through one buffer of sum(nedges) floats; the port allocates each
|
|
155
|
+
* vertex's slice.
|
|
156
|
+
* @see lib/neatogen/kkutils.c:compute_new_weights
|
|
157
|
+
*/
|
|
158
|
+
export function computeNewWeights(graph: VtxData[], n: number): void {
|
|
159
|
+
const vtxVec = new Int32Array(n);
|
|
160
|
+
for (let i = 0; i < n; i++) {
|
|
161
|
+
const weights = new Array<number>(graph[i]!.nedges).fill(0);
|
|
162
|
+
graph[i]!.ewgts = weights;
|
|
163
|
+
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
164
|
+
const degI = graph[i]!.nedges - 1;
|
|
165
|
+
for (let j = 1; j <= degI; j++) {
|
|
166
|
+
const neighbor = graph[i]!.edges[j]!;
|
|
167
|
+
weights[j] = artificialWeight(graph, degI, neighbor, vtxVec);
|
|
168
|
+
}
|
|
169
|
+
emptyNeighborsVec(graph, i, vtxVec);
|
|
170
|
+
}
|
|
171
|
+
}
|
|
172
|
+
|
|
173
|
+
/**
|
|
174
|
+
* Drop the new weights and give the caller's back. C's `old_weights` is the one
|
|
175
|
+
* block it walks by `nedges`; the port's is one array per vertex, `null` for C
|
|
176
|
+
* `NULL`. With `null` only graph[0].ewgts is cleared, so graph[1..n-1].ewgts
|
|
177
|
+
* keep the new weights (C: dangling pointers into the freed buffer).
|
|
178
|
+
* @see lib/neatogen/kkutils.c:restore_old_weights
|
|
179
|
+
*/
|
|
180
|
+
export function restoreOldWeights(graph: VtxData[], n: number, oldWeights: readonly number[][] | null): void {
|
|
181
|
+
graph[0]!.ewgts = []; // free(graph[0].ewgts); graph[0].ewgts = NULL
|
|
182
|
+
if (oldWeights !== null) {
|
|
183
|
+
for (let i = 0; i < n; i++) {
|
|
184
|
+
graph[i]!.ewgts = oldWeights[i]!;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
/**
|
|
190
|
+
* All-pairs shortest-path lengths as `DistType` (int) rows while weighting the
|
|
191
|
+
* graph so high-degree nodes are distantly located: always Dijkstra, over the
|
|
192
|
+
* int-truncated new weights.
|
|
193
|
+
* @see lib/neatogen/kkutils.c:compute_apsp_artificial_weights
|
|
194
|
+
*/
|
|
195
|
+
export function computeApspArtificialWeights(graph: VtxData[], n: number): Int32Array[] {
|
|
196
|
+
const oldWeights = graph[0]!.ewgts.length === 0 ? null : graph.slice(0, n).map((v) => v.ewgts);
|
|
197
|
+
computeNewWeights(graph, n);
|
|
198
|
+
const Dij = computeApspDijkstra(graph, n);
|
|
199
|
+
restoreOldWeights(graph, n, oldWeights);
|
|
200
|
+
return Dij;
|
|
201
|
+
}
|
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
// SPDX-License-Identifier: EPL-2.0
|
|
2
2
|
/**
|
|
3
3
|
* Neato `start` handling (setSeed / initRegular / checkStart) and the
|
|
4
|
-
* fail-loud
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* `stress_majorization_cola`, which ports both models and takes no smart init.
|
|
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
|
+
* its own unported smart-init fallback without a hierarchy is loud in
|
|
7
|
+
* constrained-majorization.ts. mode=ipsep runs `stress_majorization_cola`, which
|
|
8
|
+
* takes no smart init.
|
|
10
9
|
*
|
|
11
|
-
*
|
|
12
|
-
* fires only for the
|
|
10
|
+
* The loud check sits where neato's C branches into the unported code and
|
|
11
|
+
* fires only for the mode whose C path reaches it (ADR-3).
|
|
13
12
|
*
|
|
14
13
|
* @see lib/neatogen/neatoinit.c
|
|
15
14
|
*/
|
|
@@ -19,12 +18,10 @@ import { agNameOf } from '../../model/cgraph-ops.js';
|
|
|
19
18
|
import type { Graph } from '../../model/graph.js';
|
|
20
19
|
import { srand48 } from '../../common/random.js';
|
|
21
20
|
import { registerRenderState } from '../../common/render-state.js';
|
|
22
|
-
import { getPack } from '../pack/index.js';
|
|
23
21
|
import {
|
|
24
22
|
MODE_KK, MODE_MAJOR, MODE_HIER, MODE_IPSEP, MODE_SGD,
|
|
25
|
-
MODEL_CIRCUIT, MODEL_SUBSET,
|
|
26
23
|
} from './init.js';
|
|
27
|
-
import {
|
|
24
|
+
import { agwarningf } from '../../common/agerr.js';
|
|
28
25
|
|
|
29
26
|
/** @see lib/neatogen/neato.h:INIT_SELF */
|
|
30
27
|
export const INIT_SELF = 0;
|
|
@@ -53,8 +50,13 @@ const WARN_SELF_IGNORED = 'start=0 not supported with mode=self - ignored';
|
|
|
53
50
|
*/
|
|
54
51
|
const selfOnce = { warned: false };
|
|
55
52
|
registerRenderState(() => { selfOnce.warned = false; });
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
|
|
54
|
+
/** KK and SGD warn once and ignore start=self. @see lib/neatogen/stuff.c:330 */
|
|
55
|
+
export function warnStartSelfOnce(): void {
|
|
56
|
+
if (selfOnce.warned) return;
|
|
57
|
+
selfOnce.warned = true;
|
|
58
|
+
agwarningf(WARN_SELF_IGNORED);
|
|
59
|
+
}
|
|
58
60
|
|
|
59
61
|
/**
|
|
60
62
|
* Classify the `start` attribute: keyword prefix, digit-led (random), else the
|
|
@@ -103,7 +105,7 @@ export function checkStart(
|
|
|
103
105
|
): number {
|
|
104
106
|
const { init, seed } = parseStart(g.root.attrs.get('start'), dflt);
|
|
105
107
|
if (init !== INIT_RANDOM && [...g.nodes.values()].some((n) => n.attrs.has('pos'))) {
|
|
106
|
-
|
|
108
|
+
agwarningf(WARN_POS_IGNORED);
|
|
107
109
|
}
|
|
108
110
|
if (init === INIT_REGULAR) initRegular(g, nG);
|
|
109
111
|
srand48(seed);
|
|
@@ -151,63 +153,16 @@ function checkStartAttr(g: Graph, mode: number): void {
|
|
|
151
153
|
// mode=ipsep is not here: stress_majorization_cola takes no `opts`, so C
|
|
152
154
|
// lays start=self out from the random init, silently (T0 start-self fixtures).
|
|
153
155
|
if (mode === MODE_MAJOR) unsupported('start', value ?? '', 'smart initialisation');
|
|
154
|
-
//
|
|
155
|
-
if (
|
|
156
|
-
selfOnce.warned = true;
|
|
157
|
-
agerrLineOn('warn', WARN_SELF_IGNORED);
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
|
|
161
|
-
function isConnected(g: Graph): boolean {
|
|
162
|
-
const nodes = [...g.nodes.values()];
|
|
163
|
-
if (nodes.length === 0) return true;
|
|
164
|
-
const adj = new Map<unknown, unknown[]>(nodes.map((n) => [n, []]));
|
|
165
|
-
for (const e of g.edges) { adj.get(e.tail)?.push(e.head); adj.get(e.head)?.push(e.tail); }
|
|
166
|
-
const seen = new Set<unknown>([nodes[0]]);
|
|
167
|
-
const stack: unknown[] = [nodes[0]];
|
|
168
|
-
for (let n = stack.pop(); n !== undefined; n = stack.pop()) {
|
|
169
|
-
for (const m of adj.get(n) ?? []) if (!seen.has(m)) { seen.add(m); stack.push(m); }
|
|
170
|
-
}
|
|
171
|
-
return seen.size === nodes.length;
|
|
172
|
-
}
|
|
173
|
-
|
|
174
|
-
/** KK runs unpacked unless `pack` or `packmode` is set. @see neatoinit.c:1380-1389 */
|
|
175
|
-
function kkCircuitFallsBack(g: Graph): boolean {
|
|
176
|
-
const packed = getPack(g.root, -1, 0) >= 0 || (g.root.attrs.get('packmode') ?? '') !== '';
|
|
177
|
-
return !packed && !isConnected(g.root);
|
|
178
|
-
}
|
|
179
|
-
|
|
180
|
-
function warnCircuitDisconnected(g: Graph): void {
|
|
181
|
-
if (circuitWarned.has(g.root)) return;
|
|
182
|
-
circuitWarned.add(g.root);
|
|
183
|
-
agerrLineOn(
|
|
184
|
-
'warn',
|
|
185
|
-
`graph ${agNameOf(g.root)} is disconnected. Hence, the circuit model\n`
|
|
186
|
-
+ 'is undefined. Reverting to the shortest path model.\n'
|
|
187
|
-
+ 'Alternatively, consider running neato using -Gpack=true or decomposing\n'
|
|
188
|
-
+ 'the graph into connected components.',
|
|
189
|
-
);
|
|
190
|
-
}
|
|
191
|
-
|
|
192
|
-
function checkModel(g: Graph, mode: number, model: number): void {
|
|
193
|
-
const value = g.root.attrs.get('model') ?? '';
|
|
194
|
-
const stressPath = mode === MODE_MAJOR || mode === MODE_KK;
|
|
195
|
-
// @see lib/neatogen/stress.c:846, lib/neatogen/neatoinit.c:1246
|
|
196
|
-
if (model === MODEL_SUBSET && stressPath) unsupported('model', value, 'the subset distance model');
|
|
197
|
-
if (model !== MODEL_CIRCUIT || !stressPath) return;
|
|
198
|
-
// @see lib/neatogen/neatoinit.c:1248-1257 (disconnected: warn + shortpath)
|
|
199
|
-
if (mode === MODE_KK && kkCircuitFallsBack(g)) { warnCircuitDisconnected(g); return; }
|
|
200
|
-
// @see lib/neatogen/stress.c:851, lib/neatogen/circuit.c:circuit_model
|
|
201
|
-
unsupported('model', value, 'the circuit distance model');
|
|
156
|
+
// KK warns at kk.ts:initialPositions, after its distance model, as C does.
|
|
157
|
+
if (mode === MODE_SGD) warnStartSelfOnce();
|
|
202
158
|
}
|
|
203
159
|
|
|
204
160
|
/**
|
|
205
161
|
* Throw UNSUPPORTED_FEATURE where neato's C would run unported init code for
|
|
206
|
-
* this mode/
|
|
162
|
+
* this mode/start. Call after the nG < 2 guard.
|
|
207
163
|
* @see lib/neatogen/neatoinit.c:neatoLayout
|
|
208
164
|
*/
|
|
209
|
-
export function assertSupported(g: Graph, mode: number
|
|
165
|
+
export function assertSupported(g: Graph, mode: number): void {
|
|
210
166
|
if (maxIterNegative(g)) return;
|
|
211
167
|
checkStartAttr(g, mode);
|
|
212
|
-
checkModel(g, mode, model);
|
|
213
168
|
}
|