@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
package/dist/render.js
CHANGED
|
@@ -7378,6 +7378,9 @@ var parseHtmlLabel = (src) => parseHtmlLabelRv(src, new StderrLines(() => void 0
|
|
|
7378
7378
|
|
|
7379
7379
|
// src/gvc/image-resolver.ts
|
|
7380
7380
|
var activeResolver = null;
|
|
7381
|
+
function getGlobalImageResolver() {
|
|
7382
|
+
return activeResolver;
|
|
7383
|
+
}
|
|
7381
7384
|
var EXT_MIME = {
|
|
7382
7385
|
png: "image/png",
|
|
7383
7386
|
jpg: "image/jpeg",
|
|
@@ -7443,6 +7446,18 @@ var imagePathState = { value: void 0 };
|
|
|
7443
7446
|
registerRenderState(() => {
|
|
7444
7447
|
imagePathState.value = void 0;
|
|
7445
7448
|
});
|
|
7449
|
+
var imageHooksState = {
|
|
7450
|
+
sizer: void 0,
|
|
7451
|
+
resolver: void 0
|
|
7452
|
+
};
|
|
7453
|
+
registerRenderState(() => {
|
|
7454
|
+
imageHooksState.sizer = void 0;
|
|
7455
|
+
imageHooksState.resolver = void 0;
|
|
7456
|
+
});
|
|
7457
|
+
function setImageHooks(sizer, resolver) {
|
|
7458
|
+
imageHooksState.sizer = sizer;
|
|
7459
|
+
imageHooksState.resolver = resolver;
|
|
7460
|
+
}
|
|
7446
7461
|
function setImagePath(imagepath) {
|
|
7447
7462
|
imagePathState.value = imagepath;
|
|
7448
7463
|
}
|
|
@@ -7450,7 +7465,7 @@ function mkDirlist(list) {
|
|
|
7450
7465
|
return list === "" ? [] : list.split(PATHSEP);
|
|
7451
7466
|
}
|
|
7452
7467
|
function findPath(dirs, str) {
|
|
7453
|
-
return dirs.length > 0 && imageIsSupplied(str) ? str : null;
|
|
7468
|
+
return dirs.length > 0 && imageIsSupplied(str, imageHooksState.sizer, imageHooksState.resolver) ? str : null;
|
|
7454
7469
|
}
|
|
7455
7470
|
function safefile(filename) {
|
|
7456
7471
|
if (filename === void 0 || filename === "") return null;
|
|
@@ -7543,6 +7558,13 @@ function usershapeType(name, resolver) {
|
|
|
7543
7558
|
const found = findImageBytes(name, resolver);
|
|
7544
7559
|
return found === null ? null : imagetype(found.bytes);
|
|
7545
7560
|
}
|
|
7561
|
+
function imageNotFoundWarning(name) {
|
|
7562
|
+
return `"${name}" was not found as a file or as a shape library member`;
|
|
7563
|
+
}
|
|
7564
|
+
function imageOpenFailure(name, sizer, resolver) {
|
|
7565
|
+
if (!imageIsSupplied(name, sizer, resolver)) return imageOpenWarning(name);
|
|
7566
|
+
return usershapeType(name, resolver)?.type === ImageType.FT_NULL ? imageNotFoundWarning(name) : null;
|
|
7567
|
+
}
|
|
7546
7568
|
function imageOpenWarning(name) {
|
|
7547
7569
|
if (safefile(name) === null) return `Filename "${name}" is unsafe`;
|
|
7548
7570
|
return `${STRERROR_ENOENT} while opening ${name}`;
|
|
@@ -7864,13 +7886,15 @@ var sizeTextContent = (texts, measurer, env = defaultSizeEnv()) => {
|
|
|
7864
7886
|
var missingImages = { set: /* @__PURE__ */ new WeakSet() };
|
|
7865
7887
|
var sizeHtmlImg = (img, { imageSizer, imageResolver, imageDpi, stderr }) => {
|
|
7866
7888
|
if (img.width !== void 0 && img.height !== void 0) return missingImages.set.has(img) ? 1 : 0;
|
|
7867
|
-
const
|
|
7889
|
+
const resolver = imageResolver ?? getGlobalImageResolver() ?? void 0;
|
|
7890
|
+
const sz = usershapeSizePts(img.src, imageDpi ?? DEFAULT_DPI, imageSizer, resolver);
|
|
7868
7891
|
if (sz !== null) {
|
|
7869
7892
|
img.width = sz.x;
|
|
7870
7893
|
img.height = sz.y;
|
|
7871
7894
|
return 0;
|
|
7872
7895
|
}
|
|
7873
|
-
|
|
7896
|
+
const failure = imageOpenFailure(img.src, imageSizer, resolver);
|
|
7897
|
+
if (failure !== null) agerrLine(stderr, `Warning: ${failure}`);
|
|
7874
7898
|
agerrLine(stderr, `Error: No or improper image file="${img.src}"`);
|
|
7875
7899
|
img.width = 0;
|
|
7876
7900
|
img.height = 0;
|
|
@@ -13058,29 +13082,44 @@ function buildNodeLabel(n, g, measurer) {
|
|
|
13058
13082
|
const content = isHtml ? htmlValueContent(labelAttr) : labelAttr ?? n.name;
|
|
13059
13083
|
n.info.label = makeAnyLabel(content, isHtml, font, measurer, n);
|
|
13060
13084
|
}
|
|
13085
|
+
function warnShapefileOpen(g, shapefile) {
|
|
13086
|
+
const gvc = g.root.info.gvc;
|
|
13087
|
+
const resolver = gvc?.imageResolver ?? getGlobalImageResolver() ?? void 0;
|
|
13088
|
+
if (usershapeSizePts(shapefile, usershapeDpi(g.root.attrs), gvc?.imageSizer, resolver) !== null) return true;
|
|
13089
|
+
const failure = imageOpenFailure(shapefile, gvc?.imageSizer, resolver);
|
|
13090
|
+
if (failure !== null) agwarningf(failure);
|
|
13091
|
+
return false;
|
|
13092
|
+
}
|
|
13061
13093
|
function warnPolyInitImages(n, g) {
|
|
13062
13094
|
const shape = boundShape(n, g);
|
|
13063
13095
|
if (shape.usershape) {
|
|
13064
13096
|
if (shape.name !== CUSTOM_SHAPE_NAME) return;
|
|
13065
13097
|
const shapefile = nodeAttr(n, g, "shapefile");
|
|
13066
|
-
if (shapefile !== void 0 && shapefile !== ""
|
|
13098
|
+
if (shapefile !== void 0 && shapefile !== "" && warnShapefileOpen(g, shapefile)) return;
|
|
13067
13099
|
agwarningf(`No or improper shapefile="${shapefile ?? "<nil>"}" for node "${n.name}"`);
|
|
13068
13100
|
return;
|
|
13069
13101
|
}
|
|
13070
13102
|
const image = nodeAttr(n, g, "image");
|
|
13071
13103
|
if (image === void 0 || image === "") return;
|
|
13072
13104
|
const gvc = g.root.info.gvc;
|
|
13073
|
-
|
|
13074
|
-
|
|
13105
|
+
const failure = imageOpenFailure(image, gvc?.imageSizer, gvc?.imageResolver ?? getGlobalImageResolver() ?? void 0);
|
|
13106
|
+
if (failure === null) return;
|
|
13107
|
+
agwarningf(failure);
|
|
13075
13108
|
agwarningf(`No or improper image="${image}" for node "${n.name}"`);
|
|
13076
13109
|
}
|
|
13077
13110
|
function boundShape(n, g) {
|
|
13078
13111
|
return n.info.shape ?? bindShape(nodeAttr(n, g, "shape") ?? "ellipse", nodeAttr(n, g, "shapefile"));
|
|
13079
13112
|
}
|
|
13080
13113
|
function nodeImageSize(n, g) {
|
|
13081
|
-
|
|
13114
|
+
const shape = boundShape(n, g);
|
|
13115
|
+
if (shape.usershape && shape.name !== CUSTOM_SHAPE_NAME) return void 0;
|
|
13082
13116
|
const gvc = g.root.info.gvc;
|
|
13083
|
-
const sz = usershapeSizePts(
|
|
13117
|
+
const sz = usershapeSizePts(
|
|
13118
|
+
shape.usershape ? nodeAttr(n, g, "shapefile") : nodeAttr(n, g, "image"),
|
|
13119
|
+
usershapeDpi(g.root.attrs),
|
|
13120
|
+
gvc?.imageSizer,
|
|
13121
|
+
gvc?.imageResolver ?? getGlobalImageResolver() ?? void 0
|
|
13122
|
+
);
|
|
13084
13123
|
if (sz === null) return void 0;
|
|
13085
13124
|
g.root.info.has_images = true;
|
|
13086
13125
|
return { x: sz.x + 2, y: sz.y + 2 };
|
|
@@ -19019,6 +19058,8 @@ function fontnameCodes() {
|
|
|
19019
19058
|
function graphInit(g, useRankdir) {
|
|
19020
19059
|
g.info.charset = findCharset(g);
|
|
19021
19060
|
setImagePath(g.attrs.get("imagepath"));
|
|
19061
|
+
const gvc = g.root.info.gvc;
|
|
19062
|
+
setImageHooks(gvc?.imageSizer, gvc?.imageResolver);
|
|
19022
19063
|
let rankdir = RANKDIR_TB;
|
|
19023
19064
|
const rd = g.attrs.get("rankdir");
|
|
19024
19065
|
if (rd === "LR") rankdir = RANKDIR_LR;
|
|
@@ -36849,12 +36890,12 @@ function pccomps(g, pfx) {
|
|
|
36849
36890
|
pinned = true;
|
|
36850
36891
|
}
|
|
36851
36892
|
if (pinnedNodes.length > 0) {
|
|
36852
|
-
result.push(buildSubgraph(g, pinnedNodes, `${pfx}
|
|
36893
|
+
result.push(buildSubgraph(g, pinnedNodes, `${pfx}${idx++}`));
|
|
36853
36894
|
}
|
|
36854
36895
|
for (const n of g.nodes.values()) {
|
|
36855
36896
|
if (visited.has(n.name)) continue;
|
|
36856
36897
|
const comp = dfsCollect(g, n, visited);
|
|
36857
|
-
result.push(buildSubgraph(g, comp, `${pfx}
|
|
36898
|
+
result.push(buildSubgraph(g, comp, `${pfx}${idx++}`));
|
|
36858
36899
|
}
|
|
36859
36900
|
return { graphs: result, pinned };
|
|
36860
36901
|
}
|
|
@@ -37950,7 +37991,11 @@ var selfOnce = { warned: false };
|
|
|
37950
37991
|
registerRenderState(() => {
|
|
37951
37992
|
selfOnce.warned = false;
|
|
37952
37993
|
});
|
|
37953
|
-
|
|
37994
|
+
function warnStartSelfOnce() {
|
|
37995
|
+
if (selfOnce.warned) return;
|
|
37996
|
+
selfOnce.warned = true;
|
|
37997
|
+
agwarningf(WARN_SELF_IGNORED);
|
|
37998
|
+
}
|
|
37954
37999
|
function parseStart(p, dflt) {
|
|
37955
38000
|
let init = dflt;
|
|
37956
38001
|
let rest = p ?? "";
|
|
@@ -37980,7 +38025,7 @@ function initRegular(g, nG) {
|
|
|
37980
38025
|
function checkStart(g, nG = g.nodes.size, dflt = INIT_RANDOM) {
|
|
37981
38026
|
const { init, seed } = parseStart(g.root.attrs.get("start"), dflt);
|
|
37982
38027
|
if (init !== INIT_RANDOM && [...g.nodes.values()].some((n) => n.attrs.has("pos"))) {
|
|
37983
|
-
|
|
38028
|
+
agwarningf(WARN_POS_IGNORED);
|
|
37984
38029
|
}
|
|
37985
38030
|
if (init === INIT_REGULAR) initRegular(g, nG);
|
|
37986
38031
|
srand48(seed);
|
|
@@ -38014,65 +38059,17 @@ function checkStartAttr(g, mode) {
|
|
|
38014
38059
|
const value = g.root.attrs.get("start");
|
|
38015
38060
|
if (parseStart(value, INIT_RANDOM).init !== INIT_SELF) return;
|
|
38016
38061
|
if (mode === MODE_MAJOR) unsupported("start", value ?? "", "smart initialisation");
|
|
38017
|
-
if (
|
|
38018
|
-
selfOnce.warned = true;
|
|
38019
|
-
agerrLineOn("warn", WARN_SELF_IGNORED);
|
|
38020
|
-
}
|
|
38021
|
-
}
|
|
38022
|
-
function isConnected(g) {
|
|
38023
|
-
const nodes = [...g.nodes.values()];
|
|
38024
|
-
if (nodes.length === 0) return true;
|
|
38025
|
-
const adj = new Map(nodes.map((n) => [n, []]));
|
|
38026
|
-
for (const e of g.edges) {
|
|
38027
|
-
adj.get(e.tail)?.push(e.head);
|
|
38028
|
-
adj.get(e.head)?.push(e.tail);
|
|
38029
|
-
}
|
|
38030
|
-
const seen2 = /* @__PURE__ */ new Set([nodes[0]]);
|
|
38031
|
-
const stack = [nodes[0]];
|
|
38032
|
-
for (let n = stack.pop(); n !== void 0; n = stack.pop()) {
|
|
38033
|
-
for (const m of adj.get(n) ?? []) if (!seen2.has(m)) {
|
|
38034
|
-
seen2.add(m);
|
|
38035
|
-
stack.push(m);
|
|
38036
|
-
}
|
|
38037
|
-
}
|
|
38038
|
-
return seen2.size === nodes.length;
|
|
38039
|
-
}
|
|
38040
|
-
function kkCircuitFallsBack(g) {
|
|
38041
|
-
const packed = getPack(g.root, -1, 0) >= 0 || (g.root.attrs.get("packmode") ?? "") !== "";
|
|
38042
|
-
return !packed && !isConnected(g.root);
|
|
38043
|
-
}
|
|
38044
|
-
function warnCircuitDisconnected(g) {
|
|
38045
|
-
if (circuitWarned.has(g.root)) return;
|
|
38046
|
-
circuitWarned.add(g.root);
|
|
38047
|
-
agerrLineOn(
|
|
38048
|
-
"warn",
|
|
38049
|
-
`graph ${agNameOf(g.root)} is disconnected. Hence, the circuit model
|
|
38050
|
-
is undefined. Reverting to the shortest path model.
|
|
38051
|
-
Alternatively, consider running neato using -Gpack=true or decomposing
|
|
38052
|
-
the graph into connected components.`
|
|
38053
|
-
);
|
|
38054
|
-
}
|
|
38055
|
-
function checkModel(g, mode, model) {
|
|
38056
|
-
const value = g.root.attrs.get("model") ?? "";
|
|
38057
|
-
const stressPath = mode === MODE_MAJOR || mode === MODE_KK;
|
|
38058
|
-
if (model === MODEL_SUBSET && stressPath) unsupported("model", value, "the subset distance model");
|
|
38059
|
-
if (model !== MODEL_CIRCUIT || !stressPath) return;
|
|
38060
|
-
if (mode === MODE_KK && kkCircuitFallsBack(g)) {
|
|
38061
|
-
warnCircuitDisconnected(g);
|
|
38062
|
-
return;
|
|
38063
|
-
}
|
|
38064
|
-
unsupported("model", value, "the circuit distance model");
|
|
38062
|
+
if (mode === MODE_SGD) warnStartSelfOnce();
|
|
38065
38063
|
}
|
|
38066
|
-
function assertSupported(g, mode
|
|
38064
|
+
function assertSupported(g, mode) {
|
|
38067
38065
|
if (maxIterNegative(g)) return;
|
|
38068
38066
|
checkStartAttr(g, mode);
|
|
38069
|
-
checkModel(g, mode, model);
|
|
38070
38067
|
}
|
|
38071
38068
|
|
|
38072
38069
|
// src/layout/neato/sgd.ts
|
|
38073
38070
|
var MODEL_SHORTPATH = 0;
|
|
38074
|
-
var
|
|
38075
|
-
var
|
|
38071
|
+
var MODEL_CIRCUIT = 1;
|
|
38072
|
+
var MODEL_SUBSET = 2;
|
|
38076
38073
|
var MODEL_MDS = 3;
|
|
38077
38074
|
var SGD_EPSILON = 0.01;
|
|
38078
38075
|
var SGD_DFLT_ITERATIONS = 30;
|
|
@@ -38164,7 +38161,7 @@ function extractAdjacency(g, model) {
|
|
|
38164
38161
|
pinneds: new Array(nNodes).fill(false)
|
|
38165
38162
|
};
|
|
38166
38163
|
fillCsrEdges(g, graph);
|
|
38167
|
-
if (model ===
|
|
38164
|
+
if (model === MODEL_SUBSET) {
|
|
38168
38165
|
applySubsetWeights(graph);
|
|
38169
38166
|
}
|
|
38170
38167
|
return graph;
|
|
@@ -38262,7 +38259,7 @@ function buildUnfixed(g, n) {
|
|
|
38262
38259
|
return unfixed;
|
|
38263
38260
|
}
|
|
38264
38261
|
function resolveModel(model) {
|
|
38265
|
-
if (model ===
|
|
38262
|
+
if (model === MODEL_CIRCUIT) {
|
|
38266
38263
|
agerrLineOn(
|
|
38267
38264
|
"warn",
|
|
38268
38265
|
"circuit model not yet supported in Gmode=sgd, reverting to shortpath model"
|
|
@@ -38310,461 +38307,28 @@ function sgdLayout(g, model) {
|
|
|
38310
38307
|
posFromArray(g, pos);
|
|
38311
38308
|
}
|
|
38312
38309
|
|
|
38313
|
-
// src/layout/neato/
|
|
38314
|
-
var
|
|
38315
|
-
function
|
|
38316
|
-
|
|
38317
|
-
|
|
38318
|
-
|
|
38319
|
-
|
|
38320
|
-
|
|
38321
|
-
let amax = 0;
|
|
38322
|
-
let istar = 0;
|
|
38323
|
-
for (let ii = i; ii < n; ii++) {
|
|
38324
|
-
const dum = Math.abs(a[ii * n + i]);
|
|
38325
|
-
if (dum < amax) continue;
|
|
38326
|
-
istar = ii;
|
|
38327
|
-
amax = dum;
|
|
38328
|
-
}
|
|
38329
|
-
if (amax < MIN_PIVOT) return false;
|
|
38330
|
-
for (let j = i; j < n; j++) swap2(a, istar * n + j, i * n + j);
|
|
38331
|
-
swap2(c, istar, i);
|
|
38332
|
-
for (let ii = i + 1; ii < n; ii++) {
|
|
38333
|
-
const pivot = a[ii * n + i] / a[i * n + i];
|
|
38334
|
-
c[ii] -= pivot * c[i];
|
|
38335
|
-
for (let j = 0; j < n; j++) a[ii * n + j] = a[ii * n + j] - pivot * a[i * n + j];
|
|
38336
|
-
}
|
|
38337
|
-
return true;
|
|
38338
|
-
}
|
|
38339
|
-
function solve(a, b, c, n) {
|
|
38340
|
-
const asave = Float64Array.from(a);
|
|
38341
|
-
const csave = Float64Array.from(c);
|
|
38342
|
-
let ok = true;
|
|
38343
|
-
for (let i = 0; i < n - 1 && ok; i++) ok = eliminate(a, c, n, i);
|
|
38344
|
-
if (!ok || Math.abs(a[n * n - 1]) < MIN_PIVOT) {
|
|
38345
|
-
console.warn("ill-conditioned");
|
|
38346
|
-
return;
|
|
38347
|
-
}
|
|
38348
|
-
b[n - 1] = c[n - 1] / a[n * n - 1];
|
|
38349
|
-
for (let k = 0; k < n - 1; k++) {
|
|
38350
|
-
const m = n - k - 2;
|
|
38351
|
-
b[m] = c[m];
|
|
38352
|
-
for (let j = m + 1; j < n; j++) b[m] -= a[m * n + j] * b[j];
|
|
38353
|
-
b[m] /= a[m * n + m];
|
|
38354
|
-
}
|
|
38355
|
-
c.set(csave);
|
|
38356
|
-
a.set(asave);
|
|
38357
|
-
}
|
|
38358
|
-
|
|
38359
|
-
// src/layout/neato/kk-paths.ts
|
|
38360
|
-
function newPathState(n, dist5, adj, initialDist2) {
|
|
38361
|
-
return {
|
|
38362
|
-
n,
|
|
38363
|
-
dist: dist5,
|
|
38364
|
-
adj,
|
|
38365
|
-
initialDist: initialDist2,
|
|
38366
|
-
heap: new Int32Array(n + 1),
|
|
38367
|
-
heapSize: 0,
|
|
38368
|
-
heapIndex: new Int32Array(n).fill(-1),
|
|
38369
|
-
nd: new Float64Array(n),
|
|
38370
|
-
hops: new Int32Array(n)
|
|
38371
|
-
};
|
|
38372
|
-
}
|
|
38373
|
-
function heapUp(s, v) {
|
|
38374
|
-
for (let i = s.heapIndex[v], par; i > 0; i = par) {
|
|
38375
|
-
par = i - 1 >> 1;
|
|
38376
|
-
const u = s.heap[par];
|
|
38377
|
-
if (s.nd[u] <= s.nd[v]) break;
|
|
38378
|
-
s.heap[par] = v;
|
|
38379
|
-
s.heapIndex[v] = par;
|
|
38380
|
-
s.heap[i] = u;
|
|
38381
|
-
s.heapIndex[u] = i;
|
|
38382
|
-
}
|
|
38383
|
-
}
|
|
38384
|
-
function heapDown(s, v) {
|
|
38385
|
-
let i = s.heapIndex[v];
|
|
38386
|
-
for (let left2 = 2 * i + 1; left2 < s.heapSize; left2 = 2 * i + 1) {
|
|
38387
|
-
const right2 = left2 + 1;
|
|
38388
|
-
const c = right2 < s.heapSize && s.nd[s.heap[right2]] < s.nd[s.heap[left2]] ? right2 : left2;
|
|
38389
|
-
const u = s.heap[c];
|
|
38390
|
-
if (s.nd[v] <= s.nd[u]) break;
|
|
38391
|
-
s.heap[c] = v;
|
|
38392
|
-
s.heapIndex[v] = c;
|
|
38393
|
-
s.heap[i] = u;
|
|
38394
|
-
s.heapIndex[u] = i;
|
|
38395
|
-
i = c;
|
|
38396
|
-
}
|
|
38397
|
-
}
|
|
38398
|
-
function enqueue(s, v) {
|
|
38399
|
-
const i = s.heapSize++;
|
|
38400
|
-
s.heapIndex[v] = i;
|
|
38401
|
-
s.heap[i] = v;
|
|
38402
|
-
if (i > 0) heapUp(s, v);
|
|
38403
|
-
}
|
|
38404
|
-
function dequeue(s) {
|
|
38405
|
-
if (s.heapSize === 0) return -1;
|
|
38406
|
-
const rv = s.heap[0];
|
|
38407
|
-
const i = --s.heapSize;
|
|
38408
|
-
const v = s.heap[i];
|
|
38409
|
-
s.heap[0] = v;
|
|
38410
|
-
s.heapIndex[v] = 0;
|
|
38411
|
-
if (i > 1) heapDown(s, v);
|
|
38412
|
-
s.heapIndex[rv] = -1;
|
|
38413
|
-
return rv;
|
|
38414
|
-
}
|
|
38415
|
-
function makeSpring(s, u, v, f) {
|
|
38416
|
-
s.dist[u * s.n + v] = f;
|
|
38417
|
-
s.dist[v * s.n + u] = f;
|
|
38418
|
-
}
|
|
38419
|
-
function s1(s, src) {
|
|
38420
|
-
s.nd.fill(s.initialDist);
|
|
38421
|
-
s.nd[src] = 0;
|
|
38422
|
-
s.hops[src] = 0;
|
|
38423
|
-
enqueue(s, src);
|
|
38424
|
-
for (let v = dequeue(s); v >= 0; v = dequeue(s)) {
|
|
38425
|
-
if (v !== src) makeSpring(s, src, v, s.nd[v]);
|
|
38426
|
-
for (const { id: u, len } of s.adj[v]) {
|
|
38427
|
-
const f = s.nd[v] + len;
|
|
38428
|
-
if (s.nd[u] <= f) continue;
|
|
38429
|
-
s.nd[u] = f;
|
|
38430
|
-
if (s.heapIndex[u] >= 0) heapUp(s, u);
|
|
38431
|
-
else {
|
|
38432
|
-
s.hops[u] = s.hops[v] + 1;
|
|
38433
|
-
enqueue(s, u);
|
|
38434
|
-
}
|
|
38435
|
-
}
|
|
38436
|
-
}
|
|
38437
|
-
}
|
|
38438
|
-
function shortestPath2(s) {
|
|
38439
|
-
for (let v = 0; v < s.n; v++) s1(s, v);
|
|
38440
|
-
}
|
|
38441
|
-
function mdsModel2(dist5, n, edges) {
|
|
38442
|
-
for (const { tailSeq: i, headSeq: j, len } of edges) {
|
|
38443
|
-
if (i === j) continue;
|
|
38444
|
-
for (const k of [i * n + j, j * n + i]) if (k < dist5.length) dist5[k] = len;
|
|
38445
|
-
}
|
|
38446
|
-
}
|
|
38447
|
-
|
|
38448
|
-
// src/layout/neato/kk.ts
|
|
38449
|
-
var NDIM = 2;
|
|
38450
|
-
var DEFAULT_DAMPING = 0.99;
|
|
38451
|
-
var EPSILON_PER_NODE = 1e-4;
|
|
38452
|
-
var ITERATIONS_PER_NODE = 100;
|
|
38453
|
-
var SPRING_COEFF2 = 1;
|
|
38454
|
-
function atoi(s) {
|
|
38455
|
-
const v = parseInt(s, 10);
|
|
38456
|
-
return Number.isNaN(v) ? 0 : v;
|
|
38457
|
-
}
|
|
38458
|
-
function setEdgeLens(g, nodes) {
|
|
38459
|
-
const out = buildOutEdgeIndex(g);
|
|
38460
|
-
const lens = /* @__PURE__ */ new Map();
|
|
38461
|
-
let total = 0;
|
|
38462
|
-
for (const np of nodes) {
|
|
38463
|
-
for (const ep of out.get(np) ?? []) {
|
|
38464
|
-
const len = lenattr(ep, g);
|
|
38465
|
-
lens.set(ep, len);
|
|
38466
|
-
total += len;
|
|
38467
|
-
}
|
|
38468
|
-
}
|
|
38469
|
-
return { total, lens };
|
|
38470
|
-
}
|
|
38471
|
-
function initialDist(g, total, epsilon) {
|
|
38472
|
-
const str = g.attrs.get("defaultdist");
|
|
38473
|
-
if (str !== void 0 && str !== "") return Math.max(epsilon, parseFloat(str) || 0);
|
|
38474
|
-
const nE = g.edges.length;
|
|
38475
|
-
return total / (nE > 0 ? nE : 1) * Math.sqrt(g.nodes.size) + 1;
|
|
38476
|
-
}
|
|
38477
|
-
function epsilonOf(g, nV) {
|
|
38478
|
-
const v = parseFloat(g.attrs.get("epsilon") ?? "");
|
|
38479
|
-
return Number.isNaN(v) ? EPSILON_PER_NODE * nV : v;
|
|
38480
|
-
}
|
|
38481
|
-
function neighbours(g, nodes, lens) {
|
|
38482
|
-
const out = buildOutEdgeIndex(g);
|
|
38483
|
-
const inn = /* @__PURE__ */ new Map();
|
|
38484
|
-
for (const e of g.edges) {
|
|
38485
|
-
if (e.head === e.tail) continue;
|
|
38486
|
-
const l = inn.get(e.head);
|
|
38487
|
-
if (l === void 0) inn.set(e.head, [e]);
|
|
38488
|
-
else l.push(e);
|
|
38489
|
-
}
|
|
38490
|
-
return nodes.map((np) => {
|
|
38491
|
-
const ins = (inn.get(np) ?? []).sort((a, b) => a.tail.id - b.tail.id || a.seq - b.seq);
|
|
38492
|
-
const outs = (out.get(np) ?? []).filter((e) => e.head !== e.tail);
|
|
38493
|
-
return [...outs, ...ins].map((e) => ({
|
|
38494
|
-
id: (e.tail === np ? e.head : e.tail).info.id,
|
|
38495
|
-
len: lens.get(e)
|
|
38496
|
-
}));
|
|
38497
|
-
});
|
|
38498
|
-
}
|
|
38499
|
-
function scanGraphMode(g, maxIter) {
|
|
38500
|
-
const nodes = [...g.nodes.values()];
|
|
38501
|
-
const n = nodes.length;
|
|
38502
|
-
nodes.forEach((np, i) => {
|
|
38503
|
-
np.info.id = i;
|
|
38504
|
-
np.info.heapindex = -1;
|
|
38505
|
-
});
|
|
38506
|
-
const epsilon = epsilonOf(g, n);
|
|
38507
|
-
const damp = g.root.attrs.get("Damping");
|
|
38508
|
-
const { total, lens } = setEdgeLens(g, nodes);
|
|
38509
|
-
const ini = initialDist(g, total, epsilon);
|
|
38510
|
-
const st = {
|
|
38511
|
-
n,
|
|
38512
|
-
nodes,
|
|
38513
|
-
dist: new Float64Array(n * n).fill(ini),
|
|
38514
|
-
spring: new Float64Array(n * n).fill(1),
|
|
38515
|
-
sumT: new Float64Array(n * NDIM).fill(1),
|
|
38516
|
-
t: new Float64Array(n * n * NDIM),
|
|
38517
|
-
damping: damp === void 0 ? DEFAULT_DAMPING : parseFloat(damp) || 0,
|
|
38518
|
-
epsilon,
|
|
38519
|
-
maxIter,
|
|
38520
|
-
move: 0
|
|
38521
|
-
};
|
|
38522
|
-
return { st, adj: neighbours(g, nodes, lens), ini, lens };
|
|
38523
|
-
}
|
|
38524
|
-
function randompos(np) {
|
|
38525
|
-
np.info.pos[0] = drand48();
|
|
38526
|
-
np.info.pos[1] = drand48();
|
|
38527
|
-
}
|
|
38528
|
-
function initialPositions2(g, st) {
|
|
38529
|
-
const init = checkStart(g, st.n, INIT_RANDOM);
|
|
38530
|
-
if (init === INIT_REGULAR) return;
|
|
38531
|
-
for (const np of st.nodes) {
|
|
38532
|
-
if (np.info.posSet === true || np.info.pinned === true) continue;
|
|
38533
|
-
randompos(np);
|
|
38534
|
-
}
|
|
38535
|
-
}
|
|
38536
|
-
function distvec(p0, p1, del) {
|
|
38537
|
-
let dist5 = 0;
|
|
38538
|
-
for (let k = 0; k < NDIM; k++) {
|
|
38539
|
-
del[k] = p0[k] - p1[k];
|
|
38540
|
-
dist5 += del[k] * del[k];
|
|
38541
|
-
}
|
|
38542
|
-
return Math.sqrt(dist5);
|
|
38543
|
-
}
|
|
38544
|
-
function springFactors(g) {
|
|
38545
|
-
const byEnds = /* @__PURE__ */ new Map();
|
|
38546
|
-
const undirected = g.kind.endsWith("undirected");
|
|
38547
|
-
for (const e of g.edges) {
|
|
38548
|
-
const key = `${e.tail.info.id}:${e.head.info.id}`;
|
|
38549
|
-
if (!byEnds.has(key)) {
|
|
38550
|
-
byEnds.set(key, e.info.factor ?? lateDouble(e.attrs.get("weight"), 1, 1));
|
|
38551
|
-
}
|
|
38552
|
-
}
|
|
38553
|
-
return (a, b) => byEnds.get(`${a.info.id}:${b.info.id}`) ?? (undirected ? byEnds.get(`${b.info.id}:${a.info.id}`) : void 0);
|
|
38554
|
-
}
|
|
38555
|
-
function fillRow(st, i, del) {
|
|
38556
|
-
const vi = st.nodes[i];
|
|
38557
|
-
for (let j = 0; j < st.n; j++) {
|
|
38558
|
-
if (i === j) continue;
|
|
38559
|
-
const dist5 = distvec(vi.info.pos, st.nodes[j].info.pos, del);
|
|
38560
|
-
for (let k = 0; k < NDIM; k++) {
|
|
38561
|
-
const v = st.spring[i * st.n + j] * (del[k] - st.dist[i * st.n + j] * del[k] / dist5);
|
|
38562
|
-
st.t[(i * st.n + j) * NDIM + k] = v;
|
|
38563
|
-
st.sumT[i * NDIM + k] += v;
|
|
38564
|
-
}
|
|
38565
|
-
}
|
|
38566
|
-
}
|
|
38567
|
-
function diffeqModel(g, st) {
|
|
38568
|
-
const { n } = st;
|
|
38569
|
-
const factor = springFactors(g);
|
|
38570
|
-
for (let i = 0; i < n; i++) {
|
|
38571
|
-
for (let j = 0; j < i; j++) {
|
|
38572
|
-
let f = SPRING_COEFF2 / (st.dist[i * n + j] * st.dist[i * n + j]);
|
|
38573
|
-
const w = factor(st.nodes[i], st.nodes[j]);
|
|
38574
|
-
if (w !== void 0) f *= w;
|
|
38575
|
-
st.spring[i * n + j] = f;
|
|
38576
|
-
st.spring[j * n + i] = f;
|
|
38577
|
-
}
|
|
38578
|
-
}
|
|
38579
|
-
st.sumT.fill(0);
|
|
38580
|
-
const del = new Float64Array(NDIM);
|
|
38581
|
-
for (let i = 0; i < n; i++) fillRow(st, i, del);
|
|
38582
|
-
}
|
|
38583
|
-
function updateArrays(st, i) {
|
|
38584
|
-
const { n } = st;
|
|
38585
|
-
const del = new Float64Array(NDIM);
|
|
38586
|
-
const vi = st.nodes[i];
|
|
38587
|
-
for (let k = 0; k < NDIM; k++) st.sumT[i * NDIM + k] = 0;
|
|
38588
|
-
for (let j = 0; j < n; j++) {
|
|
38589
|
-
if (i === j) continue;
|
|
38590
|
-
const dist5 = distvec(vi.info.pos, st.nodes[j].info.pos, del);
|
|
38591
|
-
for (let k = 0; k < NDIM; k++) {
|
|
38592
|
-
const tij = st.spring[i * n + j] * (del[k] - st.dist[i * n + j] * del[k] / dist5);
|
|
38593
|
-
st.t[(i * n + j) * NDIM + k] = tij;
|
|
38594
|
-
st.sumT[i * NDIM + k] += tij;
|
|
38595
|
-
const old = st.t[(j * n + i) * NDIM + k];
|
|
38596
|
-
st.t[(j * n + i) * NDIM + k] = -tij;
|
|
38597
|
-
st.sumT[j * NDIM + k] += -tij - old;
|
|
38598
|
-
}
|
|
38599
|
-
}
|
|
38600
|
-
}
|
|
38601
|
-
function d2e(st, m, M2) {
|
|
38602
|
-
const { n } = st;
|
|
38603
|
-
const vn = st.nodes[m];
|
|
38604
|
-
const t = new Float64Array(NDIM);
|
|
38605
|
-
M2.fill(0);
|
|
38606
|
-
for (let i = 0; i < n; i++) {
|
|
38607
|
-
if (m === i) continue;
|
|
38608
|
-
const vi = st.nodes[i];
|
|
38609
|
-
let sq = 0;
|
|
38610
|
-
for (let k = 0; k < NDIM; k++) {
|
|
38611
|
-
t[k] = vn.info.pos[k] - vi.info.pos[k];
|
|
38612
|
-
sq += t[k] * t[k];
|
|
38613
|
-
}
|
|
38614
|
-
const scale = 1 / Math.pow(sq, 1.5);
|
|
38615
|
-
const K = st.spring[m * n + i];
|
|
38616
|
-
const D = st.dist[m * n + i];
|
|
38617
|
-
for (let k = 0; k < NDIM; k++) {
|
|
38618
|
-
for (let l = 0; l < k; l++) M2[l * NDIM + k] += K * D * t[k] * t[l] * scale;
|
|
38619
|
-
M2[k * NDIM + k] += K * (1 - D * (sq - t[k] * t[k]) * scale);
|
|
38620
|
-
}
|
|
38621
|
-
}
|
|
38622
|
-
for (let k = 1; k < NDIM; k++) {
|
|
38623
|
-
for (let l = 0; l < k; l++) M2[k * NDIM + l] = M2[l * NDIM + k];
|
|
38624
|
-
}
|
|
38625
|
-
}
|
|
38626
|
-
function chooseNode(st) {
|
|
38627
|
-
if (st.move >= st.maxIter) return -1;
|
|
38628
|
-
let max = 0;
|
|
38629
|
-
let choice = -1;
|
|
38630
|
-
for (let i = 0; i < st.n; i++) {
|
|
38631
|
-
if (st.nodes[i].info.pinned === true) continue;
|
|
38632
|
-
let m = 0;
|
|
38633
|
-
for (let k = 0; k < NDIM; k++) m += st.sumT[i * NDIM + k] * st.sumT[i * NDIM + k];
|
|
38634
|
-
if (m > max) {
|
|
38635
|
-
choice = i;
|
|
38636
|
-
max = m;
|
|
38637
|
-
}
|
|
38638
|
-
}
|
|
38639
|
-
return max < st.epsilon * st.epsilon ? -1 : choice;
|
|
38640
|
-
}
|
|
38641
|
-
function moveNode(st, m) {
|
|
38642
|
-
const a = new Float64Array(NDIM * NDIM);
|
|
38643
|
-
const b = new Float64Array(NDIM);
|
|
38644
|
-
const c = new Float64Array(NDIM);
|
|
38645
|
-
d2e(st, m, a);
|
|
38646
|
-
for (let i = 0; i < NDIM; i++) c[i] = -st.sumT[m * NDIM + i];
|
|
38647
|
-
solve(a, b, c, NDIM);
|
|
38648
|
-
const pos = st.nodes[m].info.pos;
|
|
38649
|
-
for (let i = 0; i < NDIM; i++) {
|
|
38650
|
-
b[i] = (st.damping + 2 * (1 - st.damping) * drand48()) * b[i];
|
|
38651
|
-
pos[i] += b[i];
|
|
38652
|
-
}
|
|
38653
|
-
st.move++;
|
|
38654
|
-
updateArrays(st, m);
|
|
38655
|
-
}
|
|
38656
|
-
function solveModel(g, st) {
|
|
38657
|
-
for (let m = chooseNode(st); m >= 0; m = chooseNode(st)) moveNode(st, m);
|
|
38658
|
-
if (st.move === st.maxIter) {
|
|
38659
|
-
agwarningf(`Max. iterations (${st.maxIter}) reached on graph ${agNameOf(g)}`);
|
|
38660
|
-
}
|
|
38661
|
-
}
|
|
38662
|
-
function mdsEdges(g, nodes, lens) {
|
|
38663
|
-
const out = buildOutEdgeIndex(g);
|
|
38664
|
-
return nodes.flatMap((v) => (out.get(v) ?? []).map((e) => ({ tailSeq: e.tail.id + 1, headSeq: e.head.id + 1, len: lens.get(e) })));
|
|
38665
|
-
}
|
|
38666
|
-
function kkNeato(g, nG, model) {
|
|
38667
|
-
const maxiter = g.attrs.get("maxiter");
|
|
38668
|
-
const maxIter = maxiter !== void 0 ? atoi(maxiter) : ITERATIONS_PER_NODE * g.nodes.size;
|
|
38669
|
-
if (nG < 2 || maxIter < 0) return;
|
|
38670
|
-
const { st, adj, ini, lens } = scanGraphMode(g, maxIter);
|
|
38671
|
-
shortestPath2(newPathState(st.n, st.dist, adj, ini));
|
|
38672
|
-
if (model === MODEL_MDS2) mdsModel2(st.dist, st.n, mdsEdges(g, st.nodes, lens));
|
|
38673
|
-
initialPositions2(g, st);
|
|
38674
|
-
diffeqModel(g, st);
|
|
38675
|
-
solveModel(g, st);
|
|
38676
|
-
}
|
|
38677
|
-
|
|
38678
|
-
// src/layout/neato/make-graph-data.ts
|
|
38679
|
-
var MODE_IPSEP2 = 3;
|
|
38680
|
-
var EDIST_IN = 1;
|
|
38681
|
-
var EDIST_OUT = -1;
|
|
38682
|
-
var EDIST_NONE = 0;
|
|
38683
|
-
function graphHasLen(g) {
|
|
38684
|
-
for (const e of g.edges) {
|
|
38685
|
-
if (e.attrs.has("len")) return true;
|
|
38686
|
-
}
|
|
38687
|
-
return false;
|
|
38688
|
-
}
|
|
38689
|
-
var edistsOf = (v) => v.edists;
|
|
38690
|
-
function reverseBackEdge(graph, i, e, mode) {
|
|
38691
|
-
const node = graph[i];
|
|
38692
|
-
const j = node.edges[e];
|
|
38693
|
-
edistsOf(node)[e] = mode === MODE_IPSEP2 ? EDIST_OUT : EDIST_IN;
|
|
38694
|
-
const target = graph[j];
|
|
38695
|
-
let f = 1;
|
|
38696
|
-
while (f < target.nedges && target.edges[f] !== i) f++;
|
|
38697
|
-
if (f >= target.nedges) throw new Error(`neato: edge ${i}-${j} has no reverse entry`);
|
|
38698
|
-
edistsOf(target)[f] = EDIST_OUT;
|
|
38699
|
-
}
|
|
38700
|
-
function dfsCycle(graph, start, st) {
|
|
38701
|
-
const { mode, mark, onstack } = st;
|
|
38702
|
-
const stack = [{ i: start, e: 1 }];
|
|
38703
|
-
mark[start] = 1;
|
|
38704
|
-
onstack[start] = 1;
|
|
38705
|
-
for (let frame = stack.at(-1); frame !== void 0; frame = stack.at(-1)) {
|
|
38706
|
-
const { i } = frame;
|
|
38707
|
-
const node = graph[i];
|
|
38708
|
-
if (frame.e >= node.nedges) {
|
|
38709
|
-
onstack[i] = 0;
|
|
38710
|
-
stack.pop();
|
|
38711
|
-
continue;
|
|
38712
|
-
}
|
|
38713
|
-
const e = frame.e++;
|
|
38714
|
-
if (edistsOf(node)[e] === EDIST_IN) continue;
|
|
38715
|
-
const j = node.edges[e];
|
|
38716
|
-
if (onstack[j]) {
|
|
38717
|
-
reverseBackEdge(graph, i, e, mode);
|
|
38718
|
-
} else if (!mark[j]) {
|
|
38719
|
-
mark[j] = 1;
|
|
38720
|
-
onstack[j] = 1;
|
|
38721
|
-
stack.push({ i: j, e: 1 });
|
|
38310
|
+
// src/layout/neato/kkutils.ts
|
|
38311
|
+
var SIZE_T_MODULUS = 2 ** 64;
|
|
38312
|
+
function commonNeighbors(graph, u, vVector) {
|
|
38313
|
+
let numSharedNeighbors = 0;
|
|
38314
|
+
for (let j = 1; j < graph[u].nedges; j++) {
|
|
38315
|
+
const neighbor2 = graph[u].edges[j];
|
|
38316
|
+
if (vVector[neighbor2] > 0) {
|
|
38317
|
+
numSharedNeighbors++;
|
|
38722
38318
|
}
|
|
38723
38319
|
}
|
|
38320
|
+
return numSharedNeighbors;
|
|
38724
38321
|
}
|
|
38725
|
-
function
|
|
38726
|
-
|
|
38727
|
-
|
|
38728
|
-
if (st.mark[i]) continue;
|
|
38729
|
-
dfsCycle(graph, i, st);
|
|
38322
|
+
function fillNeighborsVecUnweighted(graph, vtx, vtxVec) {
|
|
38323
|
+
for (let j = 1; j < graph[vtx].nedges; j++) {
|
|
38324
|
+
vtxVec[graph[vtx].edges[j]] = 1;
|
|
38730
38325
|
}
|
|
38731
38326
|
}
|
|
38732
|
-
function
|
|
38733
|
-
|
|
38734
|
-
|
|
38735
|
-
}
|
|
38736
|
-
function addNeighbours(g, np, entry, o) {
|
|
38737
|
-
const seen2 = /* @__PURE__ */ new Map();
|
|
38738
|
-
for (const ep of [...np.outEdges(g), ...np.inEdges(g)]) {
|
|
38739
|
-
if (ep.head === ep.tail) continue;
|
|
38740
|
-
const vp = ep.tail === np ? ep.head : ep.tail;
|
|
38741
|
-
const vid = vp.info.id;
|
|
38742
|
-
const dist5 = o.haveLen ? ep.info.dist ?? 0 : 1;
|
|
38743
|
-
const idx = seen2.get(vid);
|
|
38744
|
-
if (idx !== void 0) {
|
|
38745
|
-
if (o.haveLen) entry.ewgts[idx] = Math.max(entry.ewgts[idx], dist5);
|
|
38746
|
-
continue;
|
|
38747
|
-
}
|
|
38748
|
-
seen2.set(vid, entry.nedges);
|
|
38749
|
-
entry.edges.push(vid);
|
|
38750
|
-
if (o.haveLen || o.haveDir) entry.ewgts.push(dist5);
|
|
38751
|
-
if (o.haveDir) edistsOf(entry).push(edgeDist2(ep.attrs.get("dir"), np, ep.head));
|
|
38752
|
-
entry.nedges++;
|
|
38327
|
+
function emptyNeighborsVec(graph, vtx, vtxVec) {
|
|
38328
|
+
for (let j = 1; j < graph[vtx].nedges; j++) {
|
|
38329
|
+
vtxVec[graph[vtx].edges[j]] = 0;
|
|
38753
38330
|
}
|
|
38754
38331
|
}
|
|
38755
|
-
function makeGraphDataC(g, nodeList, haveLen, haveDir, mode = -1) {
|
|
38756
|
-
const vtx = nodeList.map((_, i) => ({
|
|
38757
|
-
nedges: 1,
|
|
38758
|
-
edges: [i],
|
|
38759
|
-
ewgts: haveLen || haveDir ? [0] : [],
|
|
38760
|
-
...haveDir ? { edists: [0] } : {}
|
|
38761
|
-
}));
|
|
38762
|
-
for (const np of nodeList) addNeighbours(g, np, vtx[np.info.id], { haveLen, haveDir });
|
|
38763
|
-
if (haveDir) acyclic2(vtx, nodeList.length, mode);
|
|
38764
|
-
return vtx;
|
|
38765
|
-
}
|
|
38766
|
-
|
|
38767
|
-
// src/layout/neato/kkutils.ts
|
|
38768
38332
|
function compareKeys(a, b) {
|
|
38769
38333
|
if (a < b) return -1;
|
|
38770
38334
|
if (a > b) return 1;
|
|
@@ -38798,6 +38362,40 @@ function computeApspSimple(graph, n) {
|
|
|
38798
38362
|
function computeApsp(graph, n) {
|
|
38799
38363
|
return graph[0].ewgts.length > 0 ? computeApspDijkstra(graph, n) : computeApspSimple(graph, n);
|
|
38800
38364
|
}
|
|
38365
|
+
function artificialWeight(graph, degI, neighbor2, vtxVec) {
|
|
38366
|
+
const degJ = graph[neighbor2].nedges - 1;
|
|
38367
|
+
const w = degI + degJ - 2 * commonNeighbors(graph, neighbor2, vtxVec);
|
|
38368
|
+
return Math.fround(w < 0 ? w + SIZE_T_MODULUS : w);
|
|
38369
|
+
}
|
|
38370
|
+
function computeNewWeights(graph, n) {
|
|
38371
|
+
const vtxVec = new Int32Array(n);
|
|
38372
|
+
for (let i = 0; i < n; i++) {
|
|
38373
|
+
const weights = new Array(graph[i].nedges).fill(0);
|
|
38374
|
+
graph[i].ewgts = weights;
|
|
38375
|
+
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
38376
|
+
const degI = graph[i].nedges - 1;
|
|
38377
|
+
for (let j = 1; j <= degI; j++) {
|
|
38378
|
+
const neighbor2 = graph[i].edges[j];
|
|
38379
|
+
weights[j] = artificialWeight(graph, degI, neighbor2, vtxVec);
|
|
38380
|
+
}
|
|
38381
|
+
emptyNeighborsVec(graph, i, vtxVec);
|
|
38382
|
+
}
|
|
38383
|
+
}
|
|
38384
|
+
function restoreOldWeights(graph, n, oldWeights) {
|
|
38385
|
+
graph[0].ewgts = [];
|
|
38386
|
+
if (oldWeights !== null) {
|
|
38387
|
+
for (let i = 0; i < n; i++) {
|
|
38388
|
+
graph[i].ewgts = oldWeights[i];
|
|
38389
|
+
}
|
|
38390
|
+
}
|
|
38391
|
+
}
|
|
38392
|
+
function computeApspArtificialWeights(graph, n) {
|
|
38393
|
+
const oldWeights = graph[0].ewgts.length === 0 ? null : graph.slice(0, n).map((v) => v.ewgts);
|
|
38394
|
+
computeNewWeights(graph, n);
|
|
38395
|
+
const Dij = computeApspDijkstra(graph, n);
|
|
38396
|
+
restoreOldWeights(graph, n, oldWeights);
|
|
38397
|
+
return Dij;
|
|
38398
|
+
}
|
|
38801
38399
|
|
|
38802
38400
|
// src/layout/neato/quad-prog-solve.ts
|
|
38803
38401
|
var fr2 = Math.fround;
|
|
@@ -39106,6 +38704,654 @@ function initConstrainedMajorization(packedMat, n, ordering, levels, numLevels)
|
|
|
39106
38704
|
};
|
|
39107
38705
|
}
|
|
39108
38706
|
|
|
38707
|
+
// src/layout/neato/lu.ts
|
|
38708
|
+
var DOT_VECTOR_TERMS = 8;
|
|
38709
|
+
function newArray(m, n, ival) {
|
|
38710
|
+
const mem = new Float64Array(m * n);
|
|
38711
|
+
const rv = [];
|
|
38712
|
+
for (let i = 0; i < m; i++) {
|
|
38713
|
+
rv.push(mem.subarray(i * n, (i + 1) * n));
|
|
38714
|
+
rv[i].fill(ival);
|
|
38715
|
+
}
|
|
38716
|
+
return rv;
|
|
38717
|
+
}
|
|
38718
|
+
function luScaleRows(lu, a, n, scales) {
|
|
38719
|
+
const m = lu.lu;
|
|
38720
|
+
const ps = lu.ps;
|
|
38721
|
+
for (let i = 0; i < n; i++) {
|
|
38722
|
+
let biggest = 0;
|
|
38723
|
+
for (let j = 0; j < n; j++) biggest = fmaxf(biggest, Math.abs(m[i][j] = a[i][j]));
|
|
38724
|
+
if (biggest > 0) scales[i] = 1 / biggest;
|
|
38725
|
+
else return false;
|
|
38726
|
+
ps[i] = i;
|
|
38727
|
+
}
|
|
38728
|
+
return true;
|
|
38729
|
+
}
|
|
38730
|
+
function luFindPivot(lu, k, n, scales, pivotindex) {
|
|
38731
|
+
const m = lu.lu;
|
|
38732
|
+
const ps = lu.ps;
|
|
38733
|
+
let biggest = 0;
|
|
38734
|
+
for (let i = k; i < n; i++) {
|
|
38735
|
+
const tempf = Math.abs(m[ps[i]][k]) * scales[ps[i]];
|
|
38736
|
+
if (biggest < tempf) {
|
|
38737
|
+
biggest = tempf;
|
|
38738
|
+
pivotindex = i;
|
|
38739
|
+
}
|
|
38740
|
+
}
|
|
38741
|
+
if (biggest <= 0) return -1;
|
|
38742
|
+
return pivotindex;
|
|
38743
|
+
}
|
|
38744
|
+
function luEliminate(lu, k, n) {
|
|
38745
|
+
const m = lu.lu;
|
|
38746
|
+
const ps = lu.ps;
|
|
38747
|
+
const rowK = m[ps[k]];
|
|
38748
|
+
const pivot = rowK[k];
|
|
38749
|
+
for (let i = k + 1; i < n; i++) {
|
|
38750
|
+
const rowI = m[ps[i]];
|
|
38751
|
+
const mult = rowI[k] = rowI[k] / pivot;
|
|
38752
|
+
for (let j = k + 1; j < n; j++) rowI[j] = fma(-mult, rowK[j], rowI[j]);
|
|
38753
|
+
}
|
|
38754
|
+
}
|
|
38755
|
+
function luDecompose(lu, a, n) {
|
|
38756
|
+
lu.lu = newArray(n, n, 0);
|
|
38757
|
+
lu.ps = new Int32Array(n);
|
|
38758
|
+
const scales = new Float64Array(n);
|
|
38759
|
+
if (!luScaleRows(lu, a, n, scales)) {
|
|
38760
|
+
luFree(lu);
|
|
38761
|
+
return 0;
|
|
38762
|
+
}
|
|
38763
|
+
for (let k = 0, pivotindex = 0; k < n - 1; k++) {
|
|
38764
|
+
pivotindex = luFindPivot(lu, k, n, scales, pivotindex);
|
|
38765
|
+
if (pivotindex < 0) {
|
|
38766
|
+
luFree(lu);
|
|
38767
|
+
return 0;
|
|
38768
|
+
}
|
|
38769
|
+
if (pivotindex !== k) {
|
|
38770
|
+
const ps = lu.ps;
|
|
38771
|
+
const t = ps[k];
|
|
38772
|
+
ps[k] = ps[pivotindex];
|
|
38773
|
+
ps[pivotindex] = t;
|
|
38774
|
+
}
|
|
38775
|
+
luEliminate(lu, k, n);
|
|
38776
|
+
}
|
|
38777
|
+
if (lu.lu[lu.ps[n - 1]][n - 1] === 0) {
|
|
38778
|
+
luFree(lu);
|
|
38779
|
+
return 0;
|
|
38780
|
+
}
|
|
38781
|
+
return 1;
|
|
38782
|
+
}
|
|
38783
|
+
function luDot(row, x, from, to) {
|
|
38784
|
+
const vecEnd = from + (to - from) - (to - from) % DOT_VECTOR_TERMS;
|
|
38785
|
+
let dot = 0;
|
|
38786
|
+
let j = from;
|
|
38787
|
+
for (; j < vecEnd; j++) dot += row[j] * x[j];
|
|
38788
|
+
for (; j < to; j++) dot = fma(row[j], x[j], dot);
|
|
38789
|
+
return dot;
|
|
38790
|
+
}
|
|
38791
|
+
function luSolve(lu, x, bi, n) {
|
|
38792
|
+
const m = lu.lu;
|
|
38793
|
+
const ps = lu.ps;
|
|
38794
|
+
for (let i = 0; i < n; i++) {
|
|
38795
|
+
const dot = luDot(m[ps[i]], x, 0, i);
|
|
38796
|
+
x[i] = (ps[i] === bi ? 1 : 0) - dot;
|
|
38797
|
+
}
|
|
38798
|
+
for (let i = n - 1; i >= 0; i--) {
|
|
38799
|
+
const row = m[ps[i]];
|
|
38800
|
+
const dot = luDot(row, x, i + 1, n);
|
|
38801
|
+
x[i] = (x[i] - dot) / row[i];
|
|
38802
|
+
}
|
|
38803
|
+
}
|
|
38804
|
+
function luFree(lu) {
|
|
38805
|
+
if (lu === null) {
|
|
38806
|
+
return;
|
|
38807
|
+
}
|
|
38808
|
+
lu.lu = null;
|
|
38809
|
+
lu.ps = null;
|
|
38810
|
+
}
|
|
38811
|
+
|
|
38812
|
+
// src/layout/neato/matinv.ts
|
|
38813
|
+
function matinv(A3, Ainv, n) {
|
|
38814
|
+
const lu = { lu: null, ps: null };
|
|
38815
|
+
if (luDecompose(lu, A3, n) === 0) return 0;
|
|
38816
|
+
for (let i = 0; i < n; i++) {
|
|
38817
|
+
luSolve(lu, Ainv[i], i, n);
|
|
38818
|
+
}
|
|
38819
|
+
luFree(lu);
|
|
38820
|
+
for (let i = 0; i < n; i++) {
|
|
38821
|
+
for (let j = 0; j < i; j++) {
|
|
38822
|
+
const t = Ainv[i][j];
|
|
38823
|
+
Ainv[i][j] = Ainv[j][i];
|
|
38824
|
+
Ainv[j][i] = t;
|
|
38825
|
+
}
|
|
38826
|
+
}
|
|
38827
|
+
return 1;
|
|
38828
|
+
}
|
|
38829
|
+
|
|
38830
|
+
// src/layout/neato/circuit.ts
|
|
38831
|
+
function solveCircuit(nG, Gm, GmInv) {
|
|
38832
|
+
for (let i = 0; i < nG; i++) {
|
|
38833
|
+
const row = Gm[i];
|
|
38834
|
+
let sum = 0;
|
|
38835
|
+
for (let j = 0; j < nG; j++) {
|
|
38836
|
+
if (i !== j) sum += row[j];
|
|
38837
|
+
}
|
|
38838
|
+
row[i] = -sum;
|
|
38839
|
+
}
|
|
38840
|
+
return matinv(Gm, GmInv, nG - 1);
|
|
38841
|
+
}
|
|
38842
|
+
function circuitConductances(g, nG, lens) {
|
|
38843
|
+
const Gm = newArray(nG, nG, 0);
|
|
38844
|
+
const cells = new Float64Array(Gm[0].buffer);
|
|
38845
|
+
for (const v of g.nodes.values()) {
|
|
38846
|
+
for (const e of [...v.outEdges(g), ...v.inEdges(g)]) {
|
|
38847
|
+
const i = e.tail.id + 1;
|
|
38848
|
+
const j = e.head.id + 1;
|
|
38849
|
+
if (i === j) continue;
|
|
38850
|
+
const conductance = -1 / lens.get(e);
|
|
38851
|
+
for (const k of [j * nG + i, i * nG + j]) if (k < cells.length) cells[k] = conductance;
|
|
38852
|
+
}
|
|
38853
|
+
}
|
|
38854
|
+
return Gm;
|
|
38855
|
+
}
|
|
38856
|
+
function circuitDistances(GmInv, nG, dist5) {
|
|
38857
|
+
for (let i = 0; i < nG; i++) {
|
|
38858
|
+
for (let j = 0; j < nG; j++) {
|
|
38859
|
+
dist5[i * nG + j] = GmInv[i][i] + GmInv[j][j] - 2 * GmInv[i][j];
|
|
38860
|
+
}
|
|
38861
|
+
}
|
|
38862
|
+
}
|
|
38863
|
+
function circuitModel(g, nG, dist5, lens) {
|
|
38864
|
+
const Gm = circuitConductances(g, nG, lens);
|
|
38865
|
+
const GmInv = newArray(nG, nG, 0);
|
|
38866
|
+
const rv = solveCircuit(nG, Gm, GmInv);
|
|
38867
|
+
if (rv) circuitDistances(GmInv, nG, dist5);
|
|
38868
|
+
return rv === 1;
|
|
38869
|
+
}
|
|
38870
|
+
|
|
38871
|
+
// src/layout/neato/kk-solve.ts
|
|
38872
|
+
var MIN_PIVOT = 1e-10;
|
|
38873
|
+
function swap2(x, i, j) {
|
|
38874
|
+
const t = x[i];
|
|
38875
|
+
x[i] = x[j];
|
|
38876
|
+
x[j] = t;
|
|
38877
|
+
}
|
|
38878
|
+
function eliminate(a, c, n, i) {
|
|
38879
|
+
let amax = 0;
|
|
38880
|
+
let istar = 0;
|
|
38881
|
+
for (let ii = i; ii < n; ii++) {
|
|
38882
|
+
const dum = Math.abs(a[ii * n + i]);
|
|
38883
|
+
if (dum < amax) continue;
|
|
38884
|
+
istar = ii;
|
|
38885
|
+
amax = dum;
|
|
38886
|
+
}
|
|
38887
|
+
if (amax < MIN_PIVOT) return false;
|
|
38888
|
+
for (let j = i; j < n; j++) swap2(a, istar * n + j, i * n + j);
|
|
38889
|
+
swap2(c, istar, i);
|
|
38890
|
+
for (let ii = i + 1; ii < n; ii++) {
|
|
38891
|
+
const pivot = a[ii * n + i] / a[i * n + i];
|
|
38892
|
+
c[ii] = fms(pivot, c[i], c[ii]);
|
|
38893
|
+
for (let j = 0; j < n; j++) a[ii * n + j] = fms(pivot, a[i * n + j], a[ii * n + j]);
|
|
38894
|
+
}
|
|
38895
|
+
return true;
|
|
38896
|
+
}
|
|
38897
|
+
function solve(a, b, c, n) {
|
|
38898
|
+
const asave = Float64Array.from(a);
|
|
38899
|
+
const csave = Float64Array.from(c);
|
|
38900
|
+
let ok = true;
|
|
38901
|
+
for (let i = 0; i < n - 1 && ok; i++) ok = eliminate(a, c, n, i);
|
|
38902
|
+
if (!ok || Math.abs(a[n * n - 1]) < MIN_PIVOT) {
|
|
38903
|
+
console.warn("ill-conditioned");
|
|
38904
|
+
return;
|
|
38905
|
+
}
|
|
38906
|
+
b[n - 1] = c[n - 1] / a[n * n - 1];
|
|
38907
|
+
for (let k = 0; k < n - 1; k++) {
|
|
38908
|
+
const m = n - k - 2;
|
|
38909
|
+
b[m] = c[m];
|
|
38910
|
+
for (let j = m + 1; j < n; j++) b[m] = fms(a[m * n + j], b[j], b[m]);
|
|
38911
|
+
b[m] /= a[m * n + m];
|
|
38912
|
+
}
|
|
38913
|
+
c.set(csave);
|
|
38914
|
+
a.set(asave);
|
|
38915
|
+
}
|
|
38916
|
+
|
|
38917
|
+
// src/layout/neato/make-graph-data.ts
|
|
38918
|
+
var MODE_IPSEP2 = 3;
|
|
38919
|
+
var EDIST_IN = 1;
|
|
38920
|
+
var EDIST_OUT = -1;
|
|
38921
|
+
var EDIST_NONE = 0;
|
|
38922
|
+
function graphHasLen(g) {
|
|
38923
|
+
for (const e of g.edges) {
|
|
38924
|
+
if (e.attrs.has("len")) return true;
|
|
38925
|
+
}
|
|
38926
|
+
return false;
|
|
38927
|
+
}
|
|
38928
|
+
var edistsOf = (v) => v.edists;
|
|
38929
|
+
function reverseBackEdge(graph, i, e, mode) {
|
|
38930
|
+
const node = graph[i];
|
|
38931
|
+
const j = node.edges[e];
|
|
38932
|
+
edistsOf(node)[e] = mode === MODE_IPSEP2 ? EDIST_OUT : EDIST_IN;
|
|
38933
|
+
const target = graph[j];
|
|
38934
|
+
let f = 1;
|
|
38935
|
+
while (f < target.nedges && target.edges[f] !== i) f++;
|
|
38936
|
+
if (f >= target.nedges) throw new Error(`neato: edge ${i}-${j} has no reverse entry`);
|
|
38937
|
+
edistsOf(target)[f] = EDIST_OUT;
|
|
38938
|
+
}
|
|
38939
|
+
function dfsCycle(graph, start, st) {
|
|
38940
|
+
const { mode, mark, onstack } = st;
|
|
38941
|
+
const stack = [{ i: start, e: 1 }];
|
|
38942
|
+
mark[start] = 1;
|
|
38943
|
+
onstack[start] = 1;
|
|
38944
|
+
for (let frame = stack.at(-1); frame !== void 0; frame = stack.at(-1)) {
|
|
38945
|
+
const { i } = frame;
|
|
38946
|
+
const node = graph[i];
|
|
38947
|
+
if (frame.e >= node.nedges) {
|
|
38948
|
+
onstack[i] = 0;
|
|
38949
|
+
stack.pop();
|
|
38950
|
+
continue;
|
|
38951
|
+
}
|
|
38952
|
+
const e = frame.e++;
|
|
38953
|
+
if (edistsOf(node)[e] === EDIST_IN) continue;
|
|
38954
|
+
const j = node.edges[e];
|
|
38955
|
+
if (onstack[j]) {
|
|
38956
|
+
reverseBackEdge(graph, i, e, mode);
|
|
38957
|
+
} else if (!mark[j]) {
|
|
38958
|
+
mark[j] = 1;
|
|
38959
|
+
onstack[j] = 1;
|
|
38960
|
+
stack.push({ i: j, e: 1 });
|
|
38961
|
+
}
|
|
38962
|
+
}
|
|
38963
|
+
}
|
|
38964
|
+
function acyclic2(graph, nv, mode) {
|
|
38965
|
+
const st = { mode, mark: new Uint8Array(nv), onstack: new Uint8Array(nv) };
|
|
38966
|
+
for (let i = 0; i < nv; i++) {
|
|
38967
|
+
if (st.mark[i]) continue;
|
|
38968
|
+
dfsCycle(graph, i, st);
|
|
38969
|
+
}
|
|
38970
|
+
}
|
|
38971
|
+
function edgeDist2(dir, np, head) {
|
|
38972
|
+
if (dir !== void 0 && dir.startsWith("none")) return EDIST_NONE;
|
|
38973
|
+
return np === head ? EDIST_IN : EDIST_OUT;
|
|
38974
|
+
}
|
|
38975
|
+
function addNeighbours(g, np, entry, o) {
|
|
38976
|
+
const seen2 = /* @__PURE__ */ new Map();
|
|
38977
|
+
for (const ep of [...np.outEdges(g), ...np.inEdges(g)]) {
|
|
38978
|
+
if (ep.head === ep.tail) continue;
|
|
38979
|
+
const vp = ep.tail === np ? ep.head : ep.tail;
|
|
38980
|
+
const vid = vp.info.id;
|
|
38981
|
+
const dist5 = o.haveLen ? ep.info.dist ?? 0 : 1;
|
|
38982
|
+
const idx = seen2.get(vid);
|
|
38983
|
+
if (idx !== void 0) {
|
|
38984
|
+
if (o.haveLen) entry.ewgts[idx] = Math.max(entry.ewgts[idx], dist5);
|
|
38985
|
+
continue;
|
|
38986
|
+
}
|
|
38987
|
+
seen2.set(vid, entry.nedges);
|
|
38988
|
+
entry.edges.push(vid);
|
|
38989
|
+
if (o.haveLen || o.haveDir) entry.ewgts.push(dist5);
|
|
38990
|
+
if (o.haveDir) edistsOf(entry).push(edgeDist2(ep.attrs.get("dir"), np, ep.head));
|
|
38991
|
+
entry.nedges++;
|
|
38992
|
+
}
|
|
38993
|
+
}
|
|
38994
|
+
function makeGraphDataC(g, nodeList, haveLen, haveDir, mode = -1) {
|
|
38995
|
+
const vtx = nodeList.map((_, i) => ({
|
|
38996
|
+
nedges: 1,
|
|
38997
|
+
edges: [i],
|
|
38998
|
+
ewgts: haveLen || haveDir ? [0] : [],
|
|
38999
|
+
...haveDir ? { edists: [0] } : {}
|
|
39000
|
+
}));
|
|
39001
|
+
for (const np of nodeList) addNeighbours(g, np, vtx[np.info.id], { haveLen, haveDir });
|
|
39002
|
+
if (haveDir) acyclic2(vtx, nodeList.length, mode);
|
|
39003
|
+
return vtx;
|
|
39004
|
+
}
|
|
39005
|
+
|
|
39006
|
+
// src/layout/neato/kk-paths.ts
|
|
39007
|
+
function newPathState(n, dist5, adj, initialDist2) {
|
|
39008
|
+
return {
|
|
39009
|
+
n,
|
|
39010
|
+
dist: dist5,
|
|
39011
|
+
adj,
|
|
39012
|
+
initialDist: initialDist2,
|
|
39013
|
+
heap: new Int32Array(n + 1),
|
|
39014
|
+
heapSize: 0,
|
|
39015
|
+
heapIndex: new Int32Array(n).fill(-1),
|
|
39016
|
+
nd: new Float64Array(n),
|
|
39017
|
+
hops: new Int32Array(n)
|
|
39018
|
+
};
|
|
39019
|
+
}
|
|
39020
|
+
function heapUp(s, v) {
|
|
39021
|
+
for (let i = s.heapIndex[v], par; i > 0; i = par) {
|
|
39022
|
+
par = i - 1 >> 1;
|
|
39023
|
+
const u = s.heap[par];
|
|
39024
|
+
if (s.nd[u] <= s.nd[v]) break;
|
|
39025
|
+
s.heap[par] = v;
|
|
39026
|
+
s.heapIndex[v] = par;
|
|
39027
|
+
s.heap[i] = u;
|
|
39028
|
+
s.heapIndex[u] = i;
|
|
39029
|
+
}
|
|
39030
|
+
}
|
|
39031
|
+
function heapDown(s, v) {
|
|
39032
|
+
let i = s.heapIndex[v];
|
|
39033
|
+
for (let left2 = 2 * i + 1; left2 < s.heapSize; left2 = 2 * i + 1) {
|
|
39034
|
+
const right2 = left2 + 1;
|
|
39035
|
+
const c = right2 < s.heapSize && s.nd[s.heap[right2]] < s.nd[s.heap[left2]] ? right2 : left2;
|
|
39036
|
+
const u = s.heap[c];
|
|
39037
|
+
if (s.nd[v] <= s.nd[u]) break;
|
|
39038
|
+
s.heap[c] = v;
|
|
39039
|
+
s.heapIndex[v] = c;
|
|
39040
|
+
s.heap[i] = u;
|
|
39041
|
+
s.heapIndex[u] = i;
|
|
39042
|
+
i = c;
|
|
39043
|
+
}
|
|
39044
|
+
}
|
|
39045
|
+
function enqueue(s, v) {
|
|
39046
|
+
const i = s.heapSize++;
|
|
39047
|
+
s.heapIndex[v] = i;
|
|
39048
|
+
s.heap[i] = v;
|
|
39049
|
+
if (i > 0) heapUp(s, v);
|
|
39050
|
+
}
|
|
39051
|
+
function dequeue(s) {
|
|
39052
|
+
if (s.heapSize === 0) return -1;
|
|
39053
|
+
const rv = s.heap[0];
|
|
39054
|
+
const i = --s.heapSize;
|
|
39055
|
+
const v = s.heap[i];
|
|
39056
|
+
s.heap[0] = v;
|
|
39057
|
+
s.heapIndex[v] = 0;
|
|
39058
|
+
if (i > 1) heapDown(s, v);
|
|
39059
|
+
s.heapIndex[rv] = -1;
|
|
39060
|
+
return rv;
|
|
39061
|
+
}
|
|
39062
|
+
function makeSpring(s, u, v, f) {
|
|
39063
|
+
s.dist[u * s.n + v] = f;
|
|
39064
|
+
s.dist[v * s.n + u] = f;
|
|
39065
|
+
}
|
|
39066
|
+
function s1(s, src) {
|
|
39067
|
+
s.nd.fill(s.initialDist);
|
|
39068
|
+
s.nd[src] = 0;
|
|
39069
|
+
s.hops[src] = 0;
|
|
39070
|
+
enqueue(s, src);
|
|
39071
|
+
for (let v = dequeue(s); v >= 0; v = dequeue(s)) {
|
|
39072
|
+
if (v !== src) makeSpring(s, src, v, s.nd[v]);
|
|
39073
|
+
for (const { id: u, len } of s.adj[v]) {
|
|
39074
|
+
const f = s.nd[v] + len;
|
|
39075
|
+
if (s.nd[u] <= f) continue;
|
|
39076
|
+
s.nd[u] = f;
|
|
39077
|
+
if (s.heapIndex[u] >= 0) heapUp(s, u);
|
|
39078
|
+
else {
|
|
39079
|
+
s.hops[u] = s.hops[v] + 1;
|
|
39080
|
+
enqueue(s, u);
|
|
39081
|
+
}
|
|
39082
|
+
}
|
|
39083
|
+
}
|
|
39084
|
+
}
|
|
39085
|
+
function shortestPath2(s) {
|
|
39086
|
+
for (let v = 0; v < s.n; v++) s1(s, v);
|
|
39087
|
+
}
|
|
39088
|
+
function subsetModel(g, nG, dist5) {
|
|
39089
|
+
const gp = makeGraphDataC(g, [...g.nodes.values()], false, false);
|
|
39090
|
+
const Dij = computeApspArtificialWeights(gp, nG);
|
|
39091
|
+
for (let i = 0; i < nG; i++) {
|
|
39092
|
+
for (let j = 0; j < nG; j++) {
|
|
39093
|
+
dist5[i * nG + j] = Dij[i][j];
|
|
39094
|
+
}
|
|
39095
|
+
}
|
|
39096
|
+
}
|
|
39097
|
+
function mdsModel2(dist5, n, edges) {
|
|
39098
|
+
for (const { tailSeq: i, headSeq: j, len } of edges) {
|
|
39099
|
+
if (i === j) continue;
|
|
39100
|
+
for (const k of [i * n + j, j * n + i]) if (k < dist5.length) dist5[k] = len;
|
|
39101
|
+
}
|
|
39102
|
+
}
|
|
39103
|
+
|
|
39104
|
+
// src/layout/neato/kk.ts
|
|
39105
|
+
var NDIM = 2;
|
|
39106
|
+
var DEFAULT_DAMPING = 0.99;
|
|
39107
|
+
var EPSILON_PER_NODE = 1e-4;
|
|
39108
|
+
var ITERATIONS_PER_NODE = 100;
|
|
39109
|
+
var SPRING_COEFF2 = 1;
|
|
39110
|
+
function atoi(s) {
|
|
39111
|
+
const v = parseInt(s, 10);
|
|
39112
|
+
return Number.isNaN(v) ? 0 : v;
|
|
39113
|
+
}
|
|
39114
|
+
function setEdgeLens(g, nodes) {
|
|
39115
|
+
const out = buildOutEdgeIndex(g);
|
|
39116
|
+
const lens = /* @__PURE__ */ new Map();
|
|
39117
|
+
let total = 0;
|
|
39118
|
+
for (const np of nodes) {
|
|
39119
|
+
for (const ep of out.get(np) ?? []) {
|
|
39120
|
+
const len = lenattr(ep, g);
|
|
39121
|
+
lens.set(ep, len);
|
|
39122
|
+
total += len;
|
|
39123
|
+
}
|
|
39124
|
+
}
|
|
39125
|
+
return { total, lens };
|
|
39126
|
+
}
|
|
39127
|
+
function initialDist(g, total, epsilon) {
|
|
39128
|
+
const str = g.attrs.get("defaultdist");
|
|
39129
|
+
if (str !== void 0 && str !== "") return Math.max(epsilon, parseFloat(str) || 0);
|
|
39130
|
+
const nE = g.edges.length;
|
|
39131
|
+
return fma(total / (nE > 0 ? nE : 1), Math.sqrt(g.nodes.size), 1);
|
|
39132
|
+
}
|
|
39133
|
+
function epsilonOf(g, nV) {
|
|
39134
|
+
const v = parseFloat(g.attrs.get("epsilon") ?? "");
|
|
39135
|
+
return Number.isNaN(v) ? EPSILON_PER_NODE * nV : v;
|
|
39136
|
+
}
|
|
39137
|
+
function neighbours(g, nodes, lens) {
|
|
39138
|
+
const out = buildOutEdgeIndex(g);
|
|
39139
|
+
const inn = /* @__PURE__ */ new Map();
|
|
39140
|
+
for (const e of g.edges) {
|
|
39141
|
+
if (e.head === e.tail) continue;
|
|
39142
|
+
const l = inn.get(e.head);
|
|
39143
|
+
if (l === void 0) inn.set(e.head, [e]);
|
|
39144
|
+
else l.push(e);
|
|
39145
|
+
}
|
|
39146
|
+
return nodes.map((np) => {
|
|
39147
|
+
const ins = (inn.get(np) ?? []).sort((a, b) => a.tail.id - b.tail.id || a.seq - b.seq);
|
|
39148
|
+
const outs = (out.get(np) ?? []).filter((e) => e.head !== e.tail);
|
|
39149
|
+
return [...outs, ...ins].map((e) => ({
|
|
39150
|
+
id: (e.tail === np ? e.head : e.tail).info.id,
|
|
39151
|
+
len: lens.get(e)
|
|
39152
|
+
}));
|
|
39153
|
+
});
|
|
39154
|
+
}
|
|
39155
|
+
function scanGraphMode(g, maxIter) {
|
|
39156
|
+
const nodes = [...g.nodes.values()];
|
|
39157
|
+
const n = nodes.length;
|
|
39158
|
+
nodes.forEach((np, i) => {
|
|
39159
|
+
np.info.id = i;
|
|
39160
|
+
np.info.heapindex = -1;
|
|
39161
|
+
});
|
|
39162
|
+
const epsilon = epsilonOf(g, n);
|
|
39163
|
+
const damp = g.root.attrs.get("Damping");
|
|
39164
|
+
const { total, lens } = setEdgeLens(g, nodes);
|
|
39165
|
+
const ini = initialDist(g, total, epsilon);
|
|
39166
|
+
const st = {
|
|
39167
|
+
n,
|
|
39168
|
+
nodes,
|
|
39169
|
+
dist: new Float64Array(n * n).fill(ini),
|
|
39170
|
+
spring: new Float64Array(n * n).fill(1),
|
|
39171
|
+
sumT: new Float64Array(n * NDIM).fill(1),
|
|
39172
|
+
t: new Float64Array(n * n * NDIM),
|
|
39173
|
+
damping: damp === void 0 ? DEFAULT_DAMPING : parseFloat(damp) || 0,
|
|
39174
|
+
epsilon,
|
|
39175
|
+
maxIter,
|
|
39176
|
+
move: 0
|
|
39177
|
+
};
|
|
39178
|
+
return { st, adj: neighbours(g, nodes, lens), ini, lens };
|
|
39179
|
+
}
|
|
39180
|
+
function randompos(np) {
|
|
39181
|
+
np.info.pos[0] = drand48();
|
|
39182
|
+
np.info.pos[1] = drand48();
|
|
39183
|
+
}
|
|
39184
|
+
function initialPositions2(g, st) {
|
|
39185
|
+
const init = checkStart(g, st.n, INIT_RANDOM);
|
|
39186
|
+
if (init === INIT_REGULAR) return;
|
|
39187
|
+
if (init === INIT_SELF) warnStartSelfOnce();
|
|
39188
|
+
for (const np of st.nodes) {
|
|
39189
|
+
if (np.info.posSet === true || np.info.pinned === true) continue;
|
|
39190
|
+
randompos(np);
|
|
39191
|
+
}
|
|
39192
|
+
}
|
|
39193
|
+
function distvec(p0, p1, del) {
|
|
39194
|
+
let dist5 = 0;
|
|
39195
|
+
for (let k = 0; k < NDIM; k++) {
|
|
39196
|
+
del[k] = p0[k] - p1[k];
|
|
39197
|
+
dist5 = fma(del[k], del[k], dist5);
|
|
39198
|
+
}
|
|
39199
|
+
return Math.sqrt(dist5);
|
|
39200
|
+
}
|
|
39201
|
+
function springFactors(g) {
|
|
39202
|
+
const byEnds = /* @__PURE__ */ new Map();
|
|
39203
|
+
const undirected = g.kind.endsWith("undirected");
|
|
39204
|
+
for (const e of g.edges) {
|
|
39205
|
+
const key = `${e.tail.info.id}:${e.head.info.id}`;
|
|
39206
|
+
if (!byEnds.has(key)) {
|
|
39207
|
+
byEnds.set(key, e.info.factor ?? lateDouble(e.attrs.get("weight"), 1, 1));
|
|
39208
|
+
}
|
|
39209
|
+
}
|
|
39210
|
+
return (a, b) => byEnds.get(`${a.info.id}:${b.info.id}`) ?? (undirected ? byEnds.get(`${b.info.id}:${a.info.id}`) : void 0);
|
|
39211
|
+
}
|
|
39212
|
+
function fillRow(st, i, del) {
|
|
39213
|
+
const vi = st.nodes[i];
|
|
39214
|
+
for (let j = 0; j < st.n; j++) {
|
|
39215
|
+
if (i === j) continue;
|
|
39216
|
+
const dist5 = distvec(vi.info.pos, st.nodes[j].info.pos, del);
|
|
39217
|
+
for (let k = 0; k < NDIM; k++) {
|
|
39218
|
+
const v = st.spring[i * st.n + j] * (del[k] - st.dist[i * st.n + j] * del[k] / dist5);
|
|
39219
|
+
st.t[(i * st.n + j) * NDIM + k] = v;
|
|
39220
|
+
st.sumT[i * NDIM + k] += v;
|
|
39221
|
+
}
|
|
39222
|
+
}
|
|
39223
|
+
}
|
|
39224
|
+
function diffeqModel(g, st) {
|
|
39225
|
+
const { n } = st;
|
|
39226
|
+
const factor = springFactors(g);
|
|
39227
|
+
for (let i = 0; i < n; i++) {
|
|
39228
|
+
for (let j = 0; j < i; j++) {
|
|
39229
|
+
let f = SPRING_COEFF2 / (st.dist[i * n + j] * st.dist[i * n + j]);
|
|
39230
|
+
const w = factor(st.nodes[i], st.nodes[j]);
|
|
39231
|
+
if (w !== void 0) f *= w;
|
|
39232
|
+
st.spring[i * n + j] = f;
|
|
39233
|
+
st.spring[j * n + i] = f;
|
|
39234
|
+
}
|
|
39235
|
+
}
|
|
39236
|
+
st.sumT.fill(0);
|
|
39237
|
+
const del = new Float64Array(NDIM);
|
|
39238
|
+
for (let i = 0; i < n; i++) fillRow(st, i, del);
|
|
39239
|
+
}
|
|
39240
|
+
function updateArrays(st, i) {
|
|
39241
|
+
const { n } = st;
|
|
39242
|
+
const del = new Float64Array(NDIM);
|
|
39243
|
+
const vi = st.nodes[i];
|
|
39244
|
+
for (let k = 0; k < NDIM; k++) st.sumT[i * NDIM + k] = 0;
|
|
39245
|
+
for (let j = 0; j < n; j++) {
|
|
39246
|
+
if (i === j) continue;
|
|
39247
|
+
const dist5 = distvec(vi.info.pos, st.nodes[j].info.pos, del);
|
|
39248
|
+
for (let k = 0; k < NDIM; k++) {
|
|
39249
|
+
const tij = st.spring[i * n + j] * (del[k] - st.dist[i * n + j] * del[k] / dist5);
|
|
39250
|
+
st.t[(i * n + j) * NDIM + k] = tij;
|
|
39251
|
+
st.sumT[i * NDIM + k] += tij;
|
|
39252
|
+
const old = st.t[(j * n + i) * NDIM + k];
|
|
39253
|
+
st.t[(j * n + i) * NDIM + k] = -tij;
|
|
39254
|
+
st.sumT[j * NDIM + k] += -tij - old;
|
|
39255
|
+
}
|
|
39256
|
+
}
|
|
39257
|
+
}
|
|
39258
|
+
function d2e(st, m, M2) {
|
|
39259
|
+
const { n } = st;
|
|
39260
|
+
const vn = st.nodes[m];
|
|
39261
|
+
const t = new Float64Array(NDIM);
|
|
39262
|
+
M2.fill(0);
|
|
39263
|
+
for (let i = 0; i < n; i++) {
|
|
39264
|
+
if (m === i) continue;
|
|
39265
|
+
const vi = st.nodes[i];
|
|
39266
|
+
let sq = 0;
|
|
39267
|
+
for (let k = 0; k < NDIM; k++) {
|
|
39268
|
+
t[k] = vn.info.pos[k] - vi.info.pos[k];
|
|
39269
|
+
sq = fma(t[k], t[k], sq);
|
|
39270
|
+
}
|
|
39271
|
+
const scale = 1 / Math.pow(sq, 1.5);
|
|
39272
|
+
const K = st.spring[m * n + i];
|
|
39273
|
+
const D = st.dist[m * n + i];
|
|
39274
|
+
for (let k = 0; k < NDIM; k++) {
|
|
39275
|
+
for (let l = 0; l < k; l++) M2[l * NDIM + k] = fma(K * D * t[k] * t[l], scale, M2[l * NDIM + k]);
|
|
39276
|
+
const inner = fms(D * fms(t[k], t[k], sq), scale, 1);
|
|
39277
|
+
M2[k * NDIM + k] = fma(K, inner, M2[k * NDIM + k]);
|
|
39278
|
+
}
|
|
39279
|
+
}
|
|
39280
|
+
for (let k = 1; k < NDIM; k++) {
|
|
39281
|
+
for (let l = 0; l < k; l++) M2[k * NDIM + l] = M2[l * NDIM + k];
|
|
39282
|
+
}
|
|
39283
|
+
}
|
|
39284
|
+
function chooseNode(st) {
|
|
39285
|
+
if (st.move >= st.maxIter) return -1;
|
|
39286
|
+
let max = 0;
|
|
39287
|
+
let choice = -1;
|
|
39288
|
+
for (let i = 0; i < st.n; i++) {
|
|
39289
|
+
if (st.nodes[i].info.pinned === true) continue;
|
|
39290
|
+
let m = 0;
|
|
39291
|
+
for (let k = 0; k < NDIM; k++) m = fma(st.sumT[i * NDIM + k], st.sumT[i * NDIM + k], m);
|
|
39292
|
+
if (m > max) {
|
|
39293
|
+
choice = i;
|
|
39294
|
+
max = m;
|
|
39295
|
+
}
|
|
39296
|
+
}
|
|
39297
|
+
return max < st.epsilon * st.epsilon ? -1 : choice;
|
|
39298
|
+
}
|
|
39299
|
+
function moveNode(st, m) {
|
|
39300
|
+
const a = new Float64Array(NDIM * NDIM);
|
|
39301
|
+
const b = new Float64Array(NDIM);
|
|
39302
|
+
const c = new Float64Array(NDIM);
|
|
39303
|
+
d2e(st, m, a);
|
|
39304
|
+
for (let i = 0; i < NDIM; i++) c[i] = -st.sumT[m * NDIM + i];
|
|
39305
|
+
solve(a, b, c, NDIM);
|
|
39306
|
+
const pos = st.nodes[m].info.pos;
|
|
39307
|
+
for (let i = 0; i < NDIM; i++) {
|
|
39308
|
+
b[i] = fma(2 * (1 - st.damping), drand48(), st.damping) * b[i];
|
|
39309
|
+
pos[i] += b[i];
|
|
39310
|
+
}
|
|
39311
|
+
st.move++;
|
|
39312
|
+
updateArrays(st, m);
|
|
39313
|
+
}
|
|
39314
|
+
function solveModel(g, st) {
|
|
39315
|
+
for (let m = chooseNode(st); m >= 0; m = chooseNode(st)) moveNode(st, m);
|
|
39316
|
+
if (st.move === st.maxIter) {
|
|
39317
|
+
agwarningf(`Max. iterations (${st.maxIter}) reached on graph ${agNameOf(g)}`);
|
|
39318
|
+
}
|
|
39319
|
+
}
|
|
39320
|
+
function mdsEdges(g, nodes, lens) {
|
|
39321
|
+
const out = buildOutEdgeIndex(g);
|
|
39322
|
+
return nodes.flatMap((v) => (out.get(v) ?? []).map((e) => ({ tailSeq: e.tail.id + 1, headSeq: e.head.id + 1, len: lens.get(e) })));
|
|
39323
|
+
}
|
|
39324
|
+
function kkModel(g, nG, model, run) {
|
|
39325
|
+
const { st, adj, ini, lens } = run;
|
|
39326
|
+
const shortest = () => shortestPath2(newPathState(st.n, st.dist, adj, ini));
|
|
39327
|
+
if (model === MODEL_SUBSET2) {
|
|
39328
|
+
subsetModel(g, nG, st.dist);
|
|
39329
|
+
} else if (model === MODEL_CIRCUIT2) {
|
|
39330
|
+
if (!circuitModel(g, nG, st.dist, lens)) {
|
|
39331
|
+
agwarningf(`graph ${agNameOf(g)} is disconnected. Hence, the circuit model`);
|
|
39332
|
+
agerr("prev", "is undefined. Reverting to the shortest path model.");
|
|
39333
|
+
agerr("prev", "Alternatively, consider running neato using -Gpack=true or decomposing");
|
|
39334
|
+
agerr("prev", "the graph into connected components.");
|
|
39335
|
+
shortest();
|
|
39336
|
+
}
|
|
39337
|
+
} else if (model === MODEL_MDS2) {
|
|
39338
|
+
shortest();
|
|
39339
|
+
mdsModel2(st.dist, st.n, mdsEdges(g, st.nodes, lens));
|
|
39340
|
+
} else {
|
|
39341
|
+
shortest();
|
|
39342
|
+
}
|
|
39343
|
+
}
|
|
39344
|
+
function kkNeato(g, nG, model) {
|
|
39345
|
+
const maxiter = g.attrs.get("maxiter");
|
|
39346
|
+
const maxIter = maxiter !== void 0 ? atoi(maxiter) : ITERATIONS_PER_NODE * g.nodes.size;
|
|
39347
|
+
if (nG < 2 || maxIter < 0) return;
|
|
39348
|
+
const run = scanGraphMode(g, maxIter);
|
|
39349
|
+
kkModel(g, nG, model, run);
|
|
39350
|
+
initialPositions2(g, run.st);
|
|
39351
|
+
diffeqModel(g, run.st);
|
|
39352
|
+
solveModel(g, run.st);
|
|
39353
|
+
}
|
|
39354
|
+
|
|
39109
39355
|
// src/layout/neato/conjgrad-mkernel.ts
|
|
39110
39356
|
var fr3 = Math.fround;
|
|
39111
39357
|
var RIGHT_MULT_BLOCK = 16;
|
|
@@ -39524,16 +39770,6 @@ function computeApspPacked2(graph, n) {
|
|
|
39524
39770
|
}
|
|
39525
39771
|
return Dij;
|
|
39526
39772
|
}
|
|
39527
|
-
function computeWeightedApspPacked2(graph, n) {
|
|
39528
|
-
const Dij = new Float32Array(n * (n + 1) / 2);
|
|
39529
|
-
const Di = new Float32Array(n);
|
|
39530
|
-
let count = 0;
|
|
39531
|
-
for (let i = 0; i < n; i++) {
|
|
39532
|
-
dijkstra(i, graph, n, Di);
|
|
39533
|
-
for (let j = i; j < n; j++) Dij[count++] = Di[j];
|
|
39534
|
-
}
|
|
39535
|
-
return Dij;
|
|
39536
|
-
}
|
|
39537
39773
|
function hasPos2(n) {
|
|
39538
39774
|
return n.info.posSet === true || n.info.pinned === true;
|
|
39539
39775
|
}
|
|
@@ -39702,6 +39938,109 @@ function stressMajorizationKDMkernel(Dij, n, dCoords, nodes, o) {
|
|
|
39702
39938
|
return iterations;
|
|
39703
39939
|
}
|
|
39704
39940
|
|
|
39941
|
+
// src/layout/neato/stress-models.ts
|
|
39942
|
+
function circuitModel2(graph, nG) {
|
|
39943
|
+
let Dij = new Float32Array(nG * (nG + 1) / 2);
|
|
39944
|
+
const Gm = newArray(nG, nG, 0);
|
|
39945
|
+
const GmInv = newArray(nG, nG, 0);
|
|
39946
|
+
if (graph[0].ewgts.length !== 0) {
|
|
39947
|
+
for (let i = 0; i < nG; i++) {
|
|
39948
|
+
for (let e = 1; e < graph[i].nedges; e++) {
|
|
39949
|
+
const j = graph[i].edges[e];
|
|
39950
|
+
Gm[i][j] = Gm[j][i] = -1 / Math.fround(graph[i].ewgts[e]);
|
|
39951
|
+
}
|
|
39952
|
+
}
|
|
39953
|
+
} else {
|
|
39954
|
+
for (let i = 0; i < nG; i++) {
|
|
39955
|
+
for (let e = 1; e < graph[i].nedges; e++) {
|
|
39956
|
+
const j = graph[i].edges[e];
|
|
39957
|
+
Gm[i][j] = Gm[j][i] = -1;
|
|
39958
|
+
}
|
|
39959
|
+
}
|
|
39960
|
+
}
|
|
39961
|
+
const rv = solveCircuit(nG, Gm, GmInv);
|
|
39962
|
+
if (rv) {
|
|
39963
|
+
circuitDistances2(GmInv, nG, Dij);
|
|
39964
|
+
} else {
|
|
39965
|
+
Dij = null;
|
|
39966
|
+
}
|
|
39967
|
+
return Dij;
|
|
39968
|
+
}
|
|
39969
|
+
function circuitDistances2(GmInv, nG, Dij) {
|
|
39970
|
+
let count = 0;
|
|
39971
|
+
for (let i = 0; i < nG; i++) {
|
|
39972
|
+
for (let j = i; j < nG; j++) {
|
|
39973
|
+
Dij[count++] = i === j ? 0 : GmInv[i][i] + GmInv[j][j] - 2 * GmInv[i][j];
|
|
39974
|
+
}
|
|
39975
|
+
}
|
|
39976
|
+
}
|
|
39977
|
+
function weightGraphKeepingLengths(graph, n, vtxVec) {
|
|
39978
|
+
for (let i = 0; i < n; i++) {
|
|
39979
|
+
const weights = new Array(graph[i].nedges).fill(0);
|
|
39980
|
+
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
39981
|
+
const degI = graph[i].nedges - 1;
|
|
39982
|
+
for (let j = 1; j <= degI; j++) {
|
|
39983
|
+
const neighbor2 = graph[i].edges[j];
|
|
39984
|
+
weights[j] = fmaxf(artificialWeight(graph, degI, neighbor2, vtxVec), Math.fround(graph[i].ewgts[j]));
|
|
39985
|
+
}
|
|
39986
|
+
emptyNeighborsVec(graph, i, vtxVec);
|
|
39987
|
+
graph[i].ewgts = weights;
|
|
39988
|
+
}
|
|
39989
|
+
}
|
|
39990
|
+
function weightGraph(graph, n, vtxVec) {
|
|
39991
|
+
for (let i = 0; i < n; i++) {
|
|
39992
|
+
const weights = new Array(graph[i].nedges).fill(0);
|
|
39993
|
+
graph[i].ewgts = weights;
|
|
39994
|
+
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
39995
|
+
const degI = graph[i].nedges - 1;
|
|
39996
|
+
for (let j = 1; j <= degI; j++) {
|
|
39997
|
+
const neighbor2 = graph[i].edges[j];
|
|
39998
|
+
weights[j] = artificialWeight(graph, degI, neighbor2, vtxVec);
|
|
39999
|
+
}
|
|
40000
|
+
emptyNeighborsVec(graph, i, vtxVec);
|
|
40001
|
+
}
|
|
40002
|
+
}
|
|
40003
|
+
function computeApspArtificialWeightsPacked(graph, n) {
|
|
40004
|
+
const oldWeights = graph[0].ewgts;
|
|
40005
|
+
const savedWeights = graph.slice(0, n).map((v) => v.ewgts);
|
|
40006
|
+
const vtxVec = new Int32Array(n);
|
|
40007
|
+
let Dij;
|
|
40008
|
+
if (graph[0].ewgts.length !== 0) {
|
|
40009
|
+
weightGraphKeepingLengths(graph, n, vtxVec);
|
|
40010
|
+
Dij = computeWeightedApspPacked(graph, n);
|
|
40011
|
+
} else {
|
|
40012
|
+
weightGraph(graph, n, vtxVec);
|
|
40013
|
+
Dij = computeApspPacked(graph, n);
|
|
40014
|
+
}
|
|
40015
|
+
graph[0].ewgts = [];
|
|
40016
|
+
if (oldWeights.length !== 0) {
|
|
40017
|
+
for (let i = 0; i < n; i++) {
|
|
40018
|
+
graph[i].ewgts = savedWeights[i];
|
|
40019
|
+
}
|
|
40020
|
+
}
|
|
40021
|
+
return Dij;
|
|
40022
|
+
}
|
|
40023
|
+
function modelDistances(graph, n, model) {
|
|
40024
|
+
let Dij = null;
|
|
40025
|
+
if (model === MODEL_SUBSET2) {
|
|
40026
|
+
Dij = computeApspArtificialWeightsPacked(graph, n);
|
|
40027
|
+
} else if (model === MODEL_CIRCUIT2) {
|
|
40028
|
+
Dij = circuitModel2(graph, n);
|
|
40029
|
+
if (Dij === null) {
|
|
40030
|
+
agwarningf("graph is disconnected. Hence, the circuit model");
|
|
40031
|
+
agerr("prev", "is undefined. Reverting to the shortest path model.");
|
|
40032
|
+
}
|
|
40033
|
+
} else if (model === MODEL_MDS2) {
|
|
40034
|
+
Dij = mdsModel(graph, n);
|
|
40035
|
+
}
|
|
40036
|
+
return Dij;
|
|
40037
|
+
}
|
|
40038
|
+
function stressModelDij(graph, n, model) {
|
|
40039
|
+
const Dij = modelDistances(graph, n, model);
|
|
40040
|
+
if (Dij !== null) return Dij;
|
|
40041
|
+
return graph[0].ewgts.length !== 0 ? computeWeightedApspPacked(graph, n) : computeApspPacked(graph, n);
|
|
40042
|
+
}
|
|
40043
|
+
|
|
39705
40044
|
// src/layout/neato/constrained-majorization.ts
|
|
39706
40045
|
var fr6 = Math.fround;
|
|
39707
40046
|
var LOCAL_CONSTR_MAJOR_ITERATIONS = 15;
|
|
@@ -39715,15 +40054,9 @@ var Y_AXIS = 1;
|
|
|
39715
40054
|
function unsupported2(what) {
|
|
39716
40055
|
throw new RenderError(`hierarchical stress majorization: ${what} is not supported yet`, "UNSUPPORTED_FEATURE");
|
|
39717
40056
|
}
|
|
39718
|
-
function modelDistances(graph, n, model) {
|
|
39719
|
-
if (model === MODEL_SUBSET) unsupported2("the subset distance model");
|
|
39720
|
-
if (model === MODEL_CIRCUIT) unsupported2("the circuit distance model");
|
|
39721
|
-
return model === MODEL_MDS2 ? mdsModel(graph, n) : null;
|
|
39722
|
-
}
|
|
39723
40057
|
function unconstrainedMajorization(graph, n, dCoords, nodes, o) {
|
|
39724
40058
|
if (o.maxi < 0) return 0;
|
|
39725
|
-
const
|
|
39726
|
-
const Dij = modelDistances(graph, n, o.model) ?? (weighted ? computeWeightedApspPacked2(graph, n) : computeApspPacked2(graph, n));
|
|
40059
|
+
const Dij = stressModelDij(graph, n, o.model);
|
|
39727
40060
|
if ((o.opts & OPT_SMART_INIT) !== 0 && n > 1) unsupported2("the smart initial layout");
|
|
39728
40061
|
return stressMajorizationKDMkernel(Dij, n, dCoords, nodes, {
|
|
39729
40062
|
dim: o.dim,
|
|
@@ -40795,15 +41128,16 @@ var IncVPSC = class extends VPSC {
|
|
|
40795
41128
|
var EvType = { Open: 0, Close: 1 };
|
|
40796
41129
|
|
|
40797
41130
|
// src/vpsc/SweepLine.ts
|
|
40798
|
-
function makeNode(v, r, pos) {
|
|
41131
|
+
function makeNode(v, r, pos, seq2) {
|
|
40799
41132
|
return {
|
|
40800
41133
|
v,
|
|
40801
41134
|
r,
|
|
40802
41135
|
pos,
|
|
41136
|
+
seq: seq2,
|
|
40803
41137
|
firstAbove: null,
|
|
40804
41138
|
firstBelow: null,
|
|
40805
|
-
leftNeighbours:
|
|
40806
|
-
rightNeighbours:
|
|
41139
|
+
leftNeighbours: [],
|
|
41140
|
+
rightNeighbours: []
|
|
40807
41141
|
};
|
|
40808
41142
|
}
|
|
40809
41143
|
function compareEventsSameRect(ea, eb) {
|
|
@@ -40819,7 +41153,7 @@ function compareEvents(ea, eb) {
|
|
|
40819
41153
|
function nodePosLt(a, b) {
|
|
40820
41154
|
if (a.pos < b.pos) return true;
|
|
40821
41155
|
if (b.pos < a.pos) return false;
|
|
40822
|
-
return a < b;
|
|
41156
|
+
return a.seq < b.seq;
|
|
40823
41157
|
}
|
|
40824
41158
|
function scanlineInsert(sl, node) {
|
|
40825
41159
|
let lo = 0;
|
|
@@ -40829,35 +41163,35 @@ function scanlineInsert(sl, node) {
|
|
|
40829
41163
|
if (nodePosLt(sl[mid], node)) lo = mid + 1;
|
|
40830
41164
|
else hi = mid;
|
|
40831
41165
|
}
|
|
40832
|
-
sl.splice(lo, 0, node);
|
|
41166
|
+
if (sl[lo] !== node) sl.splice(lo, 0, node);
|
|
40833
41167
|
}
|
|
40834
41168
|
function scanlineRemove(sl, node) {
|
|
40835
41169
|
const i = sl.indexOf(node);
|
|
40836
41170
|
if (i !== -1) sl.splice(i, 1);
|
|
40837
41171
|
}
|
|
40838
41172
|
function getLeftNeighbours(sl, v) {
|
|
40839
|
-
const result =
|
|
41173
|
+
const result = [];
|
|
40840
41174
|
const idx = sl.indexOf(v);
|
|
40841
41175
|
for (let i = idx - 1; i >= 0; i--) {
|
|
40842
41176
|
const u = sl[i];
|
|
40843
41177
|
if (u.r.overlapX(v.r) <= 0) {
|
|
40844
|
-
result
|
|
41178
|
+
scanlineInsert(result, u);
|
|
40845
41179
|
return result;
|
|
40846
41180
|
}
|
|
40847
|
-
if (u.r.overlapX(v.r) <= u.r.overlapY(v.r)) result
|
|
41181
|
+
if (u.r.overlapX(v.r) <= u.r.overlapY(v.r)) scanlineInsert(result, u);
|
|
40848
41182
|
}
|
|
40849
41183
|
return result;
|
|
40850
41184
|
}
|
|
40851
41185
|
function getRightNeighbours(sl, v) {
|
|
40852
|
-
const result =
|
|
41186
|
+
const result = [];
|
|
40853
41187
|
const idx = sl.indexOf(v);
|
|
40854
41188
|
for (let i = idx + 1; i < sl.length; i++) {
|
|
40855
41189
|
const u = sl[i];
|
|
40856
41190
|
if (u.r.overlapX(v.r) <= 0) {
|
|
40857
|
-
result
|
|
41191
|
+
scanlineInsert(result, u);
|
|
40858
41192
|
return result;
|
|
40859
41193
|
}
|
|
40860
|
-
if (u.r.overlapX(v.r) <= u.r.overlapY(v.r)) result
|
|
41194
|
+
if (u.r.overlapX(v.r) <= u.r.overlapY(v.r)) scanlineInsert(result, u);
|
|
40861
41195
|
}
|
|
40862
41196
|
return result;
|
|
40863
41197
|
}
|
|
@@ -40866,8 +41200,8 @@ function xOpenNeighbour(sl, v) {
|
|
|
40866
41200
|
const right2 = getRightNeighbours(sl, v);
|
|
40867
41201
|
v.leftNeighbours = left2;
|
|
40868
41202
|
v.rightNeighbours = right2;
|
|
40869
|
-
for (const n of left2) n.rightNeighbours
|
|
40870
|
-
for (const n of right2) n.leftNeighbours
|
|
41203
|
+
for (const n of left2) scanlineInsert(n.rightNeighbours, v);
|
|
41204
|
+
for (const n of right2) scanlineInsert(n.leftNeighbours, v);
|
|
40871
41205
|
}
|
|
40872
41206
|
function openLinkChain(sl, v) {
|
|
40873
41207
|
const idx = sl.indexOf(v);
|
|
@@ -40885,13 +41219,13 @@ function openLinkChain(sl, v) {
|
|
|
40885
41219
|
function xCloseLeft(v, cs) {
|
|
40886
41220
|
for (const u of v.leftNeighbours) {
|
|
40887
41221
|
cs.push(new Constraint(u.v, v.v, (v.r.width() + u.r.width()) / 2));
|
|
40888
|
-
u.rightNeighbours
|
|
41222
|
+
scanlineRemove(u.rightNeighbours, v);
|
|
40889
41223
|
}
|
|
40890
41224
|
}
|
|
40891
41225
|
function xCloseRight(v, cs) {
|
|
40892
41226
|
for (const u of v.rightNeighbours) {
|
|
40893
41227
|
cs.push(new Constraint(v.v, u.v, (v.r.width() + u.r.width()) / 2));
|
|
40894
|
-
u.leftNeighbours
|
|
41228
|
+
scanlineRemove(u.leftNeighbours, v);
|
|
40895
41229
|
}
|
|
40896
41230
|
}
|
|
40897
41231
|
function xCloseNeighbour(v, cs) {
|
|
@@ -40927,7 +41261,7 @@ function buildXEvents(rects, vs) {
|
|
|
40927
41261
|
for (let i = 0; i < rects.length; i++) {
|
|
40928
41262
|
const r = rects[i];
|
|
40929
41263
|
vs[i].desiredPosition = r.getCentreX();
|
|
40930
|
-
const node = makeNode(vs[i], r, r.getCentreX());
|
|
41264
|
+
const node = makeNode(vs[i], r, r.getCentreX(), i);
|
|
40931
41265
|
events.push({ type: EvType.Open, node, pos: r.getMinY() });
|
|
40932
41266
|
events.push({ type: EvType.Close, node, pos: r.getMaxY() });
|
|
40933
41267
|
}
|
|
@@ -40938,7 +41272,7 @@ function buildYEvents(rects, vs) {
|
|
|
40938
41272
|
for (let i = 0; i < rects.length; i++) {
|
|
40939
41273
|
const r = rects[i];
|
|
40940
41274
|
vs[i].desiredPosition = r.getCentreY();
|
|
40941
|
-
const node = makeNode(vs[i], r, r.getCentreY());
|
|
41275
|
+
const node = makeNode(vs[i], r, r.getCentreY(), i);
|
|
40942
41276
|
events.push({ type: EvType.Open, node, pos: r.getMinX() });
|
|
40943
41277
|
events.push({ type: EvType.Close, node, pos: r.getMaxX() });
|
|
40944
41278
|
}
|
|
@@ -41439,251 +41773,6 @@ function deleteCMajEnvVPSC(e) {
|
|
|
41439
41773
|
}
|
|
41440
41774
|
}
|
|
41441
41775
|
|
|
41442
|
-
// src/layout/neato/lu.ts
|
|
41443
|
-
var DOT_VECTOR_TERMS = 8;
|
|
41444
|
-
function newArray(m, n, ival) {
|
|
41445
|
-
const mem = new Float64Array(m * n);
|
|
41446
|
-
const rv = [];
|
|
41447
|
-
for (let i = 0; i < m; i++) {
|
|
41448
|
-
rv.push(mem.subarray(i * n, (i + 1) * n));
|
|
41449
|
-
rv[i].fill(ival);
|
|
41450
|
-
}
|
|
41451
|
-
return rv;
|
|
41452
|
-
}
|
|
41453
|
-
function luScaleRows(lu, a, n, scales) {
|
|
41454
|
-
const m = lu.lu;
|
|
41455
|
-
const ps = lu.ps;
|
|
41456
|
-
for (let i = 0; i < n; i++) {
|
|
41457
|
-
let biggest = 0;
|
|
41458
|
-
for (let j = 0; j < n; j++) biggest = fmaxf(biggest, Math.abs(m[i][j] = a[i][j]));
|
|
41459
|
-
if (biggest > 0) scales[i] = 1 / biggest;
|
|
41460
|
-
else return false;
|
|
41461
|
-
ps[i] = i;
|
|
41462
|
-
}
|
|
41463
|
-
return true;
|
|
41464
|
-
}
|
|
41465
|
-
function luFindPivot(lu, k, n, scales, pivotindex) {
|
|
41466
|
-
const m = lu.lu;
|
|
41467
|
-
const ps = lu.ps;
|
|
41468
|
-
let biggest = 0;
|
|
41469
|
-
for (let i = k; i < n; i++) {
|
|
41470
|
-
const tempf = Math.abs(m[ps[i]][k]) * scales[ps[i]];
|
|
41471
|
-
if (biggest < tempf) {
|
|
41472
|
-
biggest = tempf;
|
|
41473
|
-
pivotindex = i;
|
|
41474
|
-
}
|
|
41475
|
-
}
|
|
41476
|
-
if (biggest <= 0) return -1;
|
|
41477
|
-
return pivotindex;
|
|
41478
|
-
}
|
|
41479
|
-
function luEliminate(lu, k, n) {
|
|
41480
|
-
const m = lu.lu;
|
|
41481
|
-
const ps = lu.ps;
|
|
41482
|
-
const rowK = m[ps[k]];
|
|
41483
|
-
const pivot = rowK[k];
|
|
41484
|
-
for (let i = k + 1; i < n; i++) {
|
|
41485
|
-
const rowI = m[ps[i]];
|
|
41486
|
-
const mult = rowI[k] = rowI[k] / pivot;
|
|
41487
|
-
for (let j = k + 1; j < n; j++) rowI[j] = fma(-mult, rowK[j], rowI[j]);
|
|
41488
|
-
}
|
|
41489
|
-
}
|
|
41490
|
-
function luDecompose(lu, a, n) {
|
|
41491
|
-
lu.lu = newArray(n, n, 0);
|
|
41492
|
-
lu.ps = new Int32Array(n);
|
|
41493
|
-
const scales = new Float64Array(n);
|
|
41494
|
-
if (!luScaleRows(lu, a, n, scales)) {
|
|
41495
|
-
luFree(lu);
|
|
41496
|
-
return 0;
|
|
41497
|
-
}
|
|
41498
|
-
for (let k = 0, pivotindex = 0; k < n - 1; k++) {
|
|
41499
|
-
pivotindex = luFindPivot(lu, k, n, scales, pivotindex);
|
|
41500
|
-
if (pivotindex < 0) {
|
|
41501
|
-
luFree(lu);
|
|
41502
|
-
return 0;
|
|
41503
|
-
}
|
|
41504
|
-
if (pivotindex !== k) {
|
|
41505
|
-
const ps = lu.ps;
|
|
41506
|
-
const t = ps[k];
|
|
41507
|
-
ps[k] = ps[pivotindex];
|
|
41508
|
-
ps[pivotindex] = t;
|
|
41509
|
-
}
|
|
41510
|
-
luEliminate(lu, k, n);
|
|
41511
|
-
}
|
|
41512
|
-
if (lu.lu[lu.ps[n - 1]][n - 1] === 0) {
|
|
41513
|
-
luFree(lu);
|
|
41514
|
-
return 0;
|
|
41515
|
-
}
|
|
41516
|
-
return 1;
|
|
41517
|
-
}
|
|
41518
|
-
function luDot(row, x, from, to) {
|
|
41519
|
-
const vecEnd = from + (to - from) - (to - from) % DOT_VECTOR_TERMS;
|
|
41520
|
-
let dot = 0;
|
|
41521
|
-
let j = from;
|
|
41522
|
-
for (; j < vecEnd; j++) dot += row[j] * x[j];
|
|
41523
|
-
for (; j < to; j++) dot = fma(row[j], x[j], dot);
|
|
41524
|
-
return dot;
|
|
41525
|
-
}
|
|
41526
|
-
function luSolve(lu, x, bi, n) {
|
|
41527
|
-
const m = lu.lu;
|
|
41528
|
-
const ps = lu.ps;
|
|
41529
|
-
for (let i = 0; i < n; i++) {
|
|
41530
|
-
const dot = luDot(m[ps[i]], x, 0, i);
|
|
41531
|
-
x[i] = (ps[i] === bi ? 1 : 0) - dot;
|
|
41532
|
-
}
|
|
41533
|
-
for (let i = n - 1; i >= 0; i--) {
|
|
41534
|
-
const row = m[ps[i]];
|
|
41535
|
-
const dot = luDot(row, x, i + 1, n);
|
|
41536
|
-
x[i] = (x[i] - dot) / row[i];
|
|
41537
|
-
}
|
|
41538
|
-
}
|
|
41539
|
-
function luFree(lu) {
|
|
41540
|
-
if (lu === null) {
|
|
41541
|
-
return;
|
|
41542
|
-
}
|
|
41543
|
-
lu.lu = null;
|
|
41544
|
-
lu.ps = null;
|
|
41545
|
-
}
|
|
41546
|
-
|
|
41547
|
-
// src/layout/neato/matinv.ts
|
|
41548
|
-
function matinv(A3, Ainv, n) {
|
|
41549
|
-
const lu = { lu: null, ps: null };
|
|
41550
|
-
if (luDecompose(lu, A3, n) === 0) return 0;
|
|
41551
|
-
for (let i = 0; i < n; i++) {
|
|
41552
|
-
luSolve(lu, Ainv[i], i, n);
|
|
41553
|
-
}
|
|
41554
|
-
luFree(lu);
|
|
41555
|
-
for (let i = 0; i < n; i++) {
|
|
41556
|
-
for (let j = 0; j < i; j++) {
|
|
41557
|
-
const t = Ainv[i][j];
|
|
41558
|
-
Ainv[i][j] = Ainv[j][i];
|
|
41559
|
-
Ainv[j][i] = t;
|
|
41560
|
-
}
|
|
41561
|
-
}
|
|
41562
|
-
return 1;
|
|
41563
|
-
}
|
|
41564
|
-
|
|
41565
|
-
// src/layout/neato/circuit.ts
|
|
41566
|
-
function solveCircuit(nG, Gm, GmInv) {
|
|
41567
|
-
for (let i = 0; i < nG; i++) {
|
|
41568
|
-
const row = Gm[i];
|
|
41569
|
-
let sum = 0;
|
|
41570
|
-
for (let j = 0; j < nG; j++) {
|
|
41571
|
-
if (i !== j) sum += row[j];
|
|
41572
|
-
}
|
|
41573
|
-
row[i] = -sum;
|
|
41574
|
-
}
|
|
41575
|
-
return matinv(Gm, GmInv, nG - 1);
|
|
41576
|
-
}
|
|
41577
|
-
|
|
41578
|
-
// src/layout/neato/stress-models.ts
|
|
41579
|
-
var SIZE_T_MODULUS = 2 ** 64;
|
|
41580
|
-
function commonNeighbors(graph, u, vVector) {
|
|
41581
|
-
let numSharedNeighbors = 0;
|
|
41582
|
-
for (let j = 1; j < graph[u].nedges; j++) {
|
|
41583
|
-
const neighbor2 = graph[u].edges[j];
|
|
41584
|
-
if (vVector[neighbor2] > 0) {
|
|
41585
|
-
numSharedNeighbors++;
|
|
41586
|
-
}
|
|
41587
|
-
}
|
|
41588
|
-
return numSharedNeighbors;
|
|
41589
|
-
}
|
|
41590
|
-
function fillNeighborsVecUnweighted(graph, vtx, vtxVec) {
|
|
41591
|
-
for (let j = 1; j < graph[vtx].nedges; j++) {
|
|
41592
|
-
vtxVec[graph[vtx].edges[j]] = 1;
|
|
41593
|
-
}
|
|
41594
|
-
}
|
|
41595
|
-
function emptyNeighborsVec(graph, vtx, vtxVec) {
|
|
41596
|
-
for (let j = 1; j < graph[vtx].nedges; j++) {
|
|
41597
|
-
vtxVec[graph[vtx].edges[j]] = 0;
|
|
41598
|
-
}
|
|
41599
|
-
}
|
|
41600
|
-
function circuitModel(graph, nG) {
|
|
41601
|
-
let Dij = new Float32Array(nG * (nG + 1) / 2);
|
|
41602
|
-
const Gm = newArray(nG, nG, 0);
|
|
41603
|
-
const GmInv = newArray(nG, nG, 0);
|
|
41604
|
-
if (graph[0].ewgts.length !== 0) {
|
|
41605
|
-
for (let i = 0; i < nG; i++) {
|
|
41606
|
-
for (let e = 1; e < graph[i].nedges; e++) {
|
|
41607
|
-
const j = graph[i].edges[e];
|
|
41608
|
-
Gm[i][j] = Gm[j][i] = -1 / Math.fround(graph[i].ewgts[e]);
|
|
41609
|
-
}
|
|
41610
|
-
}
|
|
41611
|
-
} else {
|
|
41612
|
-
for (let i = 0; i < nG; i++) {
|
|
41613
|
-
for (let e = 1; e < graph[i].nedges; e++) {
|
|
41614
|
-
const j = graph[i].edges[e];
|
|
41615
|
-
Gm[i][j] = Gm[j][i] = -1;
|
|
41616
|
-
}
|
|
41617
|
-
}
|
|
41618
|
-
}
|
|
41619
|
-
const rv = solveCircuit(nG, Gm, GmInv);
|
|
41620
|
-
if (rv) {
|
|
41621
|
-
circuitDistances(GmInv, nG, Dij);
|
|
41622
|
-
} else {
|
|
41623
|
-
Dij = null;
|
|
41624
|
-
}
|
|
41625
|
-
return Dij;
|
|
41626
|
-
}
|
|
41627
|
-
function circuitDistances(GmInv, nG, Dij) {
|
|
41628
|
-
let count = 0;
|
|
41629
|
-
for (let i = 0; i < nG; i++) {
|
|
41630
|
-
for (let j = i; j < nG; j++) {
|
|
41631
|
-
Dij[count++] = i === j ? 0 : GmInv[i][i] + GmInv[j][j] - 2 * GmInv[i][j];
|
|
41632
|
-
}
|
|
41633
|
-
}
|
|
41634
|
-
}
|
|
41635
|
-
function artificialWeight(graph, degI, neighbor2, vtxVec) {
|
|
41636
|
-
const degJ = graph[neighbor2].nedges - 1;
|
|
41637
|
-
const w = degI + degJ - 2 * commonNeighbors(graph, neighbor2, vtxVec);
|
|
41638
|
-
return Math.fround(w < 0 ? w + SIZE_T_MODULUS : w);
|
|
41639
|
-
}
|
|
41640
|
-
function weightGraphKeepingLengths(graph, n, vtxVec) {
|
|
41641
|
-
for (let i = 0; i < n; i++) {
|
|
41642
|
-
const weights = new Array(graph[i].nedges).fill(0);
|
|
41643
|
-
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
41644
|
-
const degI = graph[i].nedges - 1;
|
|
41645
|
-
for (let j = 1; j <= degI; j++) {
|
|
41646
|
-
const neighbor2 = graph[i].edges[j];
|
|
41647
|
-
weights[j] = fmaxf(artificialWeight(graph, degI, neighbor2, vtxVec), Math.fround(graph[i].ewgts[j]));
|
|
41648
|
-
}
|
|
41649
|
-
emptyNeighborsVec(graph, i, vtxVec);
|
|
41650
|
-
graph[i].ewgts = weights;
|
|
41651
|
-
}
|
|
41652
|
-
}
|
|
41653
|
-
function weightGraph(graph, n, vtxVec) {
|
|
41654
|
-
for (let i = 0; i < n; i++) {
|
|
41655
|
-
const weights = new Array(graph[i].nedges).fill(0);
|
|
41656
|
-
graph[i].ewgts = weights;
|
|
41657
|
-
fillNeighborsVecUnweighted(graph, i, vtxVec);
|
|
41658
|
-
const degI = graph[i].nedges - 1;
|
|
41659
|
-
for (let j = 1; j <= degI; j++) {
|
|
41660
|
-
const neighbor2 = graph[i].edges[j];
|
|
41661
|
-
weights[j] = artificialWeight(graph, degI, neighbor2, vtxVec);
|
|
41662
|
-
}
|
|
41663
|
-
emptyNeighborsVec(graph, i, vtxVec);
|
|
41664
|
-
}
|
|
41665
|
-
}
|
|
41666
|
-
function computeApspArtificialWeightsPacked(graph, n) {
|
|
41667
|
-
const oldWeights = graph[0].ewgts;
|
|
41668
|
-
const savedWeights = graph.slice(0, n).map((v) => v.ewgts);
|
|
41669
|
-
const vtxVec = new Int32Array(n);
|
|
41670
|
-
let Dij;
|
|
41671
|
-
if (graph[0].ewgts.length !== 0) {
|
|
41672
|
-
weightGraphKeepingLengths(graph, n, vtxVec);
|
|
41673
|
-
Dij = computeWeightedApspPacked(graph, n);
|
|
41674
|
-
} else {
|
|
41675
|
-
weightGraph(graph, n, vtxVec);
|
|
41676
|
-
Dij = computeApspPacked(graph, n);
|
|
41677
|
-
}
|
|
41678
|
-
graph[0].ewgts = [];
|
|
41679
|
-
if (oldWeights.length !== 0) {
|
|
41680
|
-
for (let i = 0; i < n; i++) {
|
|
41681
|
-
graph[i].ewgts = savedWeights[i];
|
|
41682
|
-
}
|
|
41683
|
-
}
|
|
41684
|
-
return Dij;
|
|
41685
|
-
}
|
|
41686
|
-
|
|
41687
41776
|
// src/layout/neato/stress-cola.ts
|
|
41688
41777
|
var fr9 = Math.fround;
|
|
41689
41778
|
var LOCAL_CONSTR_MAJOR_ITERATIONS2 = 1e3;
|
|
@@ -41707,10 +41796,10 @@ function maxEdgeLength(graph, n) {
|
|
|
41707
41796
|
}
|
|
41708
41797
|
function modelDistances2(graph, n, model) {
|
|
41709
41798
|
let Dij = null;
|
|
41710
|
-
if (model ===
|
|
41799
|
+
if (model === MODEL_SUBSET2) {
|
|
41711
41800
|
Dij = computeApspArtificialWeightsPacked(graph, n);
|
|
41712
|
-
} else if (model ===
|
|
41713
|
-
Dij =
|
|
41801
|
+
} else if (model === MODEL_CIRCUIT2) {
|
|
41802
|
+
Dij = circuitModel2(graph, n);
|
|
41714
41803
|
if (!Dij) {
|
|
41715
41804
|
agwarningf("graph is disconnected. Hence, the circuit model");
|
|
41716
41805
|
agerr("prev", "is undefined. Reverting to the shortest path model.");
|
|
@@ -48708,8 +48797,8 @@ var MODE_IPSEP = 3;
|
|
|
48708
48797
|
var MODE_SGD = 4;
|
|
48709
48798
|
var SGD_ITERATIONS = 30;
|
|
48710
48799
|
var MODEL_SHORTPATH2 = 0;
|
|
48711
|
-
var
|
|
48712
|
-
var
|
|
48800
|
+
var MODEL_CIRCUIT2 = 1;
|
|
48801
|
+
var MODEL_SUBSET2 = 2;
|
|
48713
48802
|
var MODEL_MDS2 = 3;
|
|
48714
48803
|
var DFLT_DIM = 2;
|
|
48715
48804
|
var POINTS_PER_INCH11 = 72;
|
|
@@ -48753,7 +48842,7 @@ function neatoMaxIter(maxiter, mode, n) {
|
|
|
48753
48842
|
}
|
|
48754
48843
|
var levelsGapOf = (g) => lateDouble(g.root.attrs.get("levelsgap"), 0, -Number.MAX_VALUE);
|
|
48755
48844
|
function solveStress(c, vtx, dCoords, nodeList) {
|
|
48756
|
-
const { g, mode, model,
|
|
48845
|
+
const { g, mode, model, opts } = c;
|
|
48757
48846
|
const n = nodeList.length;
|
|
48758
48847
|
const maxi = neatoMaxIter(g.attrs.get("maxiter"), mode, n);
|
|
48759
48848
|
const epsilon = lateDouble(g.attrs.get("epsilon"), 1e-4, 0);
|
|
@@ -48777,7 +48866,7 @@ function solveStress(c, vtx, dCoords, nodeList) {
|
|
|
48777
48866
|
opt
|
|
48778
48867
|
});
|
|
48779
48868
|
}
|
|
48780
|
-
const Dij =
|
|
48869
|
+
const Dij = stressModelDij(vtx, n, model);
|
|
48781
48870
|
return stressMajorizationKDMkernel(Dij, n, dCoords, nodeList, {
|
|
48782
48871
|
dim: DFLT_DIM,
|
|
48783
48872
|
opts,
|
|
@@ -48789,13 +48878,13 @@ function runMajorization(g, mode, model, am) {
|
|
|
48789
48878
|
const nodeList = assignNodeIds2(g);
|
|
48790
48879
|
setEdgeLen(g);
|
|
48791
48880
|
const n = nodeList.length;
|
|
48792
|
-
const haveLen = graphHasLen(g);
|
|
48881
|
+
const haveLen = model !== MODEL_SUBSET2 && graphHasLen(g);
|
|
48793
48882
|
const init = checkStart(g, n, mode === MODE_HIER ? INIT_SELF : INIT_RANDOM);
|
|
48794
48883
|
const opts = checkExp(g) | (init === INIT_SELF ? OPT_SMART_INIT : 0);
|
|
48795
48884
|
const haveDir = mode === MODE_HIER || mode === MODE_IPSEP;
|
|
48796
48885
|
const vtx = makeGraphDataC(g, nodeList, haveLen, haveDir, mode);
|
|
48797
48886
|
const dCoords = [new Float64Array(n), new Float64Array(n)];
|
|
48798
|
-
if (solveStress({ g, mode, model,
|
|
48887
|
+
if (solveStress({ g, mode, model, opts, am }, vtx, dCoords, nodeList) < 0) {
|
|
48799
48888
|
agerr("prev", "layout aborted");
|
|
48800
48889
|
return;
|
|
48801
48890
|
}
|
|
@@ -48805,8 +48894,9 @@ function runMajorization(g, mode, model, am) {
|
|
|
48805
48894
|
}
|
|
48806
48895
|
var NO_ADJUST = { mode: AM_NONE, print: "none", value: 0 };
|
|
48807
48896
|
function solveModel2(g, mode, model, am = NO_ADJUST) {
|
|
48808
|
-
|
|
48809
|
-
|
|
48897
|
+
const nG = g.nodes.size;
|
|
48898
|
+
if (nG < 2 || neatoMaxIter(g.attrs.get("maxiter"), mode, nG) < 0) return;
|
|
48899
|
+
assertSupported(g, mode);
|
|
48810
48900
|
if (mode === MODE_KK) return kkNeato(g, g.nodes.size, model);
|
|
48811
48901
|
if (mode === MODE_SGD) {
|
|
48812
48902
|
if (parseStart(g.root.attrs.get("start"), INIT_RANDOM).init === INIT_REGULAR) checkStart(g);
|
|
@@ -49198,16 +49288,27 @@ function layoutMulti(g, comps, globalRoot, pinfo) {
|
|
|
49198
49288
|
function parseMode(g) {
|
|
49199
49289
|
return neatoMode(g);
|
|
49200
49290
|
}
|
|
49201
|
-
var
|
|
49202
|
-
|
|
49203
|
-
|
|
49204
|
-
|
|
49205
|
-
|
|
49206
|
-
|
|
49291
|
+
var EDGE_LEN_ATTR = "len";
|
|
49292
|
+
function edgeLenDeclared(g) {
|
|
49293
|
+
if (g.edgeDefaults.has(EDGE_LEN_ATTR)) return true;
|
|
49294
|
+
for (const e of g.edges) if (e.attrs.has(EDGE_LEN_ATTR)) return true;
|
|
49295
|
+
for (const sub of g.subgraphs.values()) if (edgeLenDeclared(sub)) return true;
|
|
49296
|
+
return false;
|
|
49297
|
+
}
|
|
49207
49298
|
function parseModel(g) {
|
|
49208
|
-
const
|
|
49209
|
-
if (
|
|
49210
|
-
|
|
49299
|
+
const p = g.attrs.get("model");
|
|
49300
|
+
if (p === void 0 || p === "") return MODEL_SHORTPATH2;
|
|
49301
|
+
if (p === "circuit") return MODEL_CIRCUIT2;
|
|
49302
|
+
if (p === "subset") return MODEL_SUBSET2;
|
|
49303
|
+
if (p === "shortpath") return MODEL_SHORTPATH2;
|
|
49304
|
+
if (p === "mds") {
|
|
49305
|
+
if (edgeLenDeclared(g)) return MODEL_MDS2;
|
|
49306
|
+
agwarningf(`edges in graph ${agNameOf(g.root)} have no len attribute. Hence, the mds model`);
|
|
49307
|
+
agerr("prev", "is inappropriate. Reverting to the shortest path model.");
|
|
49308
|
+
return MODEL_SHORTPATH2;
|
|
49309
|
+
}
|
|
49310
|
+
agwarningf(`Unknown value ${p} for attribute "model" in graph ${agNameOf(g.root)} - ignored`);
|
|
49311
|
+
return MODEL_SHORTPATH2;
|
|
49211
49312
|
}
|
|
49212
49313
|
function maybeRemoveOverlap(g, am) {
|
|
49213
49314
|
removeOverlapWith(g, am);
|