@knowvah/dot-engine 2.12.1 → 2.12.3
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/api/builder.d.ts +7 -1
- package/dist/api/builder.d.ts.map +1 -1
- package/dist/api.js +14 -7
- package/dist/api.js.map +2 -2
- package/dist/common/compass-port.d.ts.map +1 -1
- package/dist/common/edge-label-init.d.ts +26 -1
- package/dist/common/edge-label-init.d.ts.map +1 -1
- package/dist/common/graph-init.d.ts.map +1 -1
- package/dist/common/htmltable-label.d.ts.map +1 -1
- package/dist/common/htmltable-lex.d.ts +3 -1
- package/dist/common/htmltable-lex.d.ts.map +1 -1
- package/dist/common/htmltable-parse-image.d.ts +23 -0
- package/dist/common/htmltable-parse-image.d.ts.map +1 -0
- package/dist/common/htmltable-parse-state.d.ts +4 -0
- package/dist/common/htmltable-parse-state.d.ts.map +1 -1
- package/dist/common/htmltable-parse.d.ts +33 -2
- package/dist/common/htmltable-parse.d.ts.map +1 -1
- package/dist/common/nodeinit.d.ts +16 -2
- package/dist/common/nodeinit.d.ts.map +1 -1
- package/dist/common/poly-inside.d.ts.map +1 -1
- package/dist/common/splines-geom.d.ts +2 -1
- package/dist/common/splines-geom.d.ts.map +1 -1
- package/dist/common/splines-path-begin.d.ts.map +1 -1
- package/dist/common/splines-path-end.d.ts.map +1 -1
- package/dist/common/splines-routespl.d.ts +3 -0
- package/dist/common/splines-routespl.d.ts.map +1 -1
- package/dist/gvc/context.d.ts +8 -0
- package/dist/gvc/context.d.ts.map +1 -1
- package/dist/gvc/emit-gates.d.ts +5 -10
- package/dist/gvc/emit-gates.d.ts.map +1 -1
- package/dist/gvc/emit-xdot.d.ts +7 -6
- package/dist/gvc/emit-xdot.d.ts.map +1 -1
- package/dist/gvc/job.d.ts +5 -2
- package/dist/gvc/job.d.ts.map +1 -1
- package/dist/gvc/viewport.d.ts +10 -5
- package/dist/gvc/viewport.d.ts.map +1 -1
- package/dist/index.js +21565 -21326
- package/dist/index.js.map +4 -4
- package/dist/layout/dot/classify.d.ts.map +1 -1
- package/dist/layout/dot/edge-route-chain-views.d.ts +35 -0
- package/dist/layout/dot/edge-route-chain-views.d.ts.map +1 -0
- package/dist/layout/dot/edge-route-chain.d.ts +20 -16
- package/dist/layout/dot/edge-route-chain.d.ts.map +1 -1
- package/dist/layout/dot/edge-route-faithful.d.ts.map +1 -1
- package/dist/layout/dot/edge-route.d.ts +7 -3
- package/dist/layout/dot/edge-route.d.ts.map +1 -1
- package/dist/layout/dot/fastgr.d.ts +5 -3
- package/dist/layout/dot/fastgr.d.ts.map +1 -1
- package/dist/layout/dot/flat-adj-record.d.ts +22 -0
- package/dist/layout/dot/flat-adj-record.d.ts.map +1 -0
- package/dist/layout/dot/flat.d.ts +22 -7
- package/dist/layout/dot/flat.d.ts.map +1 -1
- package/dist/layout/dot/init.d.ts +49 -9
- package/dist/layout/dot/init.d.ts.map +1 -1
- package/dist/layout/dot/mincross-build.d.ts +6 -0
- package/dist/layout/dot/mincross-build.d.ts.map +1 -1
- package/dist/layout/dot/mincross-flat.d.ts +10 -1
- package/dist/layout/dot/mincross-flat.d.ts.map +1 -1
- package/dist/layout/dot/mincross.d.ts +6 -1
- package/dist/layout/dot/mincross.d.ts.map +1 -1
- package/dist/layout/dot/ns-subtree.d.ts +9 -6
- package/dist/layout/dot/ns-subtree.d.ts.map +1 -1
- package/dist/layout/dot/pack-components.d.ts +4 -3
- package/dist/layout/dot/pack-components.d.ts.map +1 -1
- package/dist/layout/dot/position-aux.d.ts +69 -21
- package/dist/layout/dot/position-aux.d.ts.map +1 -1
- package/dist/layout/dot/position-bbox.d.ts.map +1 -1
- package/dist/layout/dot/position-ycoords.d.ts.map +1 -1
- package/dist/layout/dot/position.d.ts.map +1 -1
- package/dist/layout/dot/rank-dot2.d.ts +7 -25
- package/dist/layout/dot/rank-dot2.d.ts.map +1 -1
- package/dist/layout/dot/self-loop.d.ts +11 -4
- package/dist/layout/dot/self-loop.d.ts.map +1 -1
- package/dist/layout/dot/splines-clone.d.ts +2 -1
- package/dist/layout/dot/splines-clone.d.ts.map +1 -1
- package/dist/layout/dot/splines-flat-labeled.d.ts.map +1 -1
- package/dist/layout/dot/splines-flat-multi.d.ts +11 -3
- package/dist/layout/dot/splines-flat-multi.d.ts.map +1 -1
- package/dist/layout/dot/splines-flat.d.ts +18 -0
- package/dist/layout/dot/splines-flat.d.ts.map +1 -1
- package/dist/layout/dot/splines-groups.d.ts.map +1 -1
- package/dist/layout/dot/splines-route.d.ts +6 -3
- package/dist/layout/dot/splines-route.d.ts.map +1 -1
- package/dist/layout/dot/straight-edges.d.ts.map +1 -1
- package/dist/layout/fdp/ports.d.ts.map +1 -1
- package/dist/layout/fdp/tlayout.d.ts +3 -0
- package/dist/layout/fdp/tlayout.d.ts.map +1 -1
- package/dist/layout/neato/__fixtures__/hier-imds.d.ts +5 -4
- package/dist/layout/neato/__fixtures__/hier-imds.d.ts.map +1 -1
- package/dist/layout/neato/__fixtures__/hier-majorization.d.ts +6 -5
- package/dist/layout/neato/__fixtures__/hier-majorization.d.ts.map +1 -1
- package/dist/layout/neato/conjgrad-mkernel.d.ts.map +1 -1
- package/dist/layout/neato/conjgrad.d.ts +7 -6
- package/dist/layout/neato/conjgrad.d.ts.map +1 -1
- package/dist/layout/neato/matrix-ops-dense.d.ts +1 -6
- package/dist/layout/neato/matrix-ops-dense.d.ts.map +1 -1
- package/dist/layout/neato/matrix-ops.d.ts +0 -6
- package/dist/layout/neato/matrix-ops.d.ts.map +1 -1
- package/dist/layout/neato/quad-prog-vpsc.d.ts.map +1 -1
- package/dist/layout/neato/sgd.d.ts.map +1 -1
- package/dist/model/cgraph-ops.d.ts +10 -2
- package/dist/model/cgraph-ops.d.ts.map +1 -1
- package/dist/model/edge.d.ts +7 -2
- package/dist/model/edge.d.ts.map +1 -1
- package/dist/model/edgeInfo.d.ts +17 -2
- package/dist/model/edgeInfo.d.ts.map +1 -1
- package/dist/model/graph.d.ts +4 -3
- package/dist/model/graph.d.ts.map +1 -1
- package/dist/model/lazy-attrs.d.ts.map +1 -1
- package/dist/model/rankEntry.d.ts +3 -1
- package/dist/model/rankEntry.d.ts.map +1 -1
- package/dist/ortho/index.d.ts +0 -1
- package/dist/ortho/index.d.ts.map +1 -1
- package/dist/ortho/partition.d.ts +2 -4
- package/dist/ortho/partition.d.ts.map +1 -1
- package/dist/parser/builder.d.ts.map +1 -1
- package/dist/pathplan/route.d.ts +93 -0
- package/dist/pathplan/route.d.ts.map +1 -1
- package/dist/render/dot/agwrite.d.ts +26 -10
- package/dist/render/dot/agwrite.d.ts.map +1 -1
- package/dist/render/dot/attrs.d.ts +15 -4
- package/dist/render/dot/attrs.d.ts.map +1 -1
- package/dist/render/dot/types.d.ts +7 -2
- package/dist/render/dot/types.d.ts.map +1 -1
- package/dist/render/dot/write-back.d.ts +14 -0
- package/dist/render/dot/write-back.d.ts.map +1 -1
- package/dist/render/dot/xdot-ops.d.ts +20 -29
- package/dist/render/dot/xdot-ops.d.ts.map +1 -1
- package/dist/render/dot.d.ts +4 -2
- package/dist/render/dot.d.ts.map +1 -1
- package/dist/render/json-cluster-edge.d.ts +17 -4
- package/dist/render/json-cluster-edge.d.ts.map +1 -1
- package/dist/render/json-nonfinite.d.ts +17 -0
- package/dist/render/json-nonfinite.d.ts.map +1 -0
- package/dist/render/json.d.ts +4 -0
- package/dist/render/json.d.ts.map +1 -1
- package/dist/render/map.d.ts +3 -0
- package/dist/render/map.d.ts.map +1 -1
- package/dist/render/svg-graph.d.ts.map +1 -1
- package/dist/render/svg-id.d.ts +10 -1
- package/dist/render/svg-id.d.ts.map +1 -1
- package/dist/render/svg.d.ts +3 -1
- package/dist/render/svg.d.ts.map +1 -1
- package/dist/render.js +21517 -21278
- package/dist/render.js.map +4 -4
- package/dist/util/bsd-qsort.d.ts.map +1 -1
- package/dist/util/overflow.d.ts +37 -0
- package/dist/util/overflow.d.ts.map +1 -0
- package/dist/xdot/parse.d.ts.map +1 -1
- package/dist/xdot/strtod.d.ts +23 -0
- package/dist/xdot/strtod.d.ts.map +1 -0
- package/package.json +3 -2
- package/src/api/builder.ts +8 -2
- package/src/common/compass-port.ts +36 -20
- package/src/common/edge-label-init.ts +43 -17
- package/src/common/graph-init.ts +11 -1
- package/src/common/htmltable-label.ts +9 -4
- package/src/common/htmltable-lex.ts +5 -2
- package/src/common/htmltable-parse-image.ts +69 -0
- package/src/common/htmltable-parse-state.ts +6 -0
- package/src/common/htmltable-parse.ts +34 -44
- package/src/common/nodeinit.ts +28 -8
- package/src/common/poly-inside.ts +11 -5
- package/src/common/splines-geom.ts +24 -6
- package/src/common/splines-path-begin.ts +4 -3
- package/src/common/splines-path-end.ts +4 -3
- package/src/common/splines-routespl.ts +32 -0
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.1 +19 -19
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.2 +19 -19
- package/src/gvc/__fixtures__/rerender/abom-shift-pack.dot.plain.nofree.3 +19 -19
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.dot.plain.nofree.2 +18 -18
- package/src/gvc/__fixtures__/rerender/abom-shift-parity.dot.plain.nofree.3 +12 -12
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.1 +20 -20
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.2 +31 -31
- package/src/gvc/__fixtures__/rerender/flat-rev-stale.dot.plain.nofree.3 +33 -33
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.plain.nofree.1 +10 -10
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.plain.nofree.2 +28 -28
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.plain.nofree.3 +28 -28
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.1 +21 -28
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.2 +100 -102
- package/src/gvc/__fixtures__/rerender/multi-edge.dot.svg.nofree.3 +137 -139
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.1 +1 -1
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.2 +1 -1
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.dot.nofree.3 +1 -1
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.1 +3 -3
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.2 +3 -3
- package/src/gvc/__fixtures__/rerender/nestedclust.dot.xdot.nofree.3 +3 -3
- package/src/gvc/__fixtures__/rerender/regen.sh +6 -0
- package/src/gvc/context.ts +8 -0
- package/src/gvc/device.ts +6 -6
- package/src/gvc/emit-gates.ts +6 -15
- package/src/gvc/emit-xdot.ts +10 -11
- package/src/gvc/job.ts +5 -2
- package/src/gvc/viewport.ts +13 -7
- package/src/layout/dot/__fixtures__/flat-adj-aux-syms.native-16.1.json +1210 -0
- package/src/layout/dot/classify.ts +5 -2
- package/src/layout/dot/edge-route-chain-views.ts +120 -0
- package/src/layout/dot/edge-route-chain.ts +103 -117
- package/src/layout/dot/edge-route-faithful.ts +20 -5
- package/src/layout/dot/edge-route.ts +44 -49
- package/src/layout/dot/fastgr.ts +9 -3
- package/src/layout/dot/flat-adj-record.ts +68 -0
- package/src/layout/dot/flat.ts +38 -17
- package/src/layout/dot/init.ts +59 -13
- package/src/layout/dot/mincross-build.ts +14 -1
- package/src/layout/dot/mincross-flat.ts +15 -5
- package/src/layout/dot/mincross.ts +6 -2
- package/src/layout/dot/ns-subtree.ts +11 -7
- package/src/layout/dot/pack-components.ts +6 -4
- package/src/layout/dot/position-aux.ts +122 -42
- package/src/layout/dot/position-bbox.ts +14 -1
- package/src/layout/dot/position-ycoords.ts +7 -1
- package/src/layout/dot/position.ts +4 -1
- package/src/layout/dot/rank-dot2.ts +13 -94
- package/src/layout/dot/self-loop.ts +29 -11
- package/src/layout/dot/splines-clone.ts +8 -2
- package/src/layout/dot/splines-flat-labeled.ts +3 -2
- package/src/layout/dot/splines-flat-multi.ts +12 -4
- package/src/layout/dot/splines-flat.ts +9 -19
- package/src/layout/dot/splines-groups.ts +5 -3
- package/src/layout/dot/splines-route.ts +10 -11
- package/src/layout/dot/straight-edges.ts +5 -3
- package/src/layout/fdp/ports.ts +6 -2
- package/src/layout/fdp/tlayout.ts +6 -5
- package/src/layout/neato/__fixtures__/conjgrad-d.json +1 -0
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.dot +141 -141
- package/src/layout/neato/__fixtures__/dim/hier-big-dim3.xdot +339 -339
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.dot +140 -140
- package/src/layout/neato/__fixtures__/dim/hier-big-dim4.xdot +323 -323
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.dot +141 -141
- package/src/layout/neato/__fixtures__/dim/hier-big-subset-dim3.xdot +339 -339
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.dot +251 -251
- package/src/layout/neato/__fixtures__/dim/hier-big110-dim3.xdot +535 -535
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.dot +14 -14
- package/src/layout/neato/__fixtures__/dim/hier-circuit-dim3.xdot +32 -32
- package/src/layout/neato/__fixtures__/dim/hier-dim4.dot +8 -8
- package/src/layout/neato/__fixtures__/dim/hier-dim4.xdot +14 -14
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.dot +17 -17
- package/src/layout/neato/__fixtures__/dim/hier-len-dim3.xdot +35 -35
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.dot +2 -2
- package/src/layout/neato/__fixtures__/dim/hier-noedge-big.xdot +2 -2
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.dot +11 -11
- package/src/layout/neato/__fixtures__/dim/hier-ring-dim3.xdot +21 -21
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.dot +14 -14
- package/src/layout/neato/__fixtures__/dim/hier-star-dim3.xdot +26 -26
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.dot +13 -13
- package/src/layout/neato/__fixtures__/dim/hier-stresswt1-dim4.xdot +30 -30
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.dot +10 -10
- package/src/layout/neato/__fixtures__/dim/hier-subset-dim3.xdot +19 -19
- package/src/layout/neato/__fixtures__/dim/smart-units.json +1 -1
- package/src/layout/neato/__fixtures__/hier/cases/dirnone.plain +10 -10
- package/src/layout/neato/__fixtures__/hier/cases/tdist.plain +12 -12
- package/src/layout/neato/__fixtures__/hier/hier-probe.plain +1 -1
- package/src/layout/neato/__fixtures__/hier/hier-probe.xdot +19 -19
- package/src/layout/neato/__fixtures__/hier-imds.ts +14 -13
- package/src/layout/neato/__fixtures__/hier-majorization.ts +24 -23
- package/src/layout/neato/__fixtures__/ipsep/ipsep-grid.xdot +20 -20
- package/src/layout/neato/__fixtures__/ipsep/ipsep-k6.xdot +8 -8
- package/src/layout/neato/__fixtures__/ipsep/ipsep-rand-len.xdot +34 -34
- package/src/layout/neato/__fixtures__/ipsep/ipsep-rand.xdot +32 -32
- package/src/layout/neato/__fixtures__/ipsep/ipsep-tree.xdot +18 -18
- package/src/layout/neato/__fixtures__/ipsep/kd-ipsep-len.xdot +13 -13
- package/src/layout/neato/__fixtures__/ipsep/kd-ipsep.xdot +12 -12
- package/src/layout/neato/__fixtures__/models/hier-circuit.xdot +33 -33
- package/src/layout/neato/__fixtures__/models/hier-default.xdot +30 -30
- package/src/layout/neato/__fixtures__/models/hier-mds-nolen.xdot +30 -30
- package/src/layout/neato/__fixtures__/models/hier-pin-disc-circuit.xdot +35 -35
- package/src/layout/neato/__fixtures__/models/hier-shortpath.xdot +30 -30
- package/src/layout/neato/conjgrad-mkernel.ts +6 -2
- package/src/layout/neato/conjgrad.ts +38 -35
- package/src/layout/neato/matrix-ops-dense.ts +2 -20
- package/src/layout/neato/matrix-ops.ts +0 -20
- package/src/layout/neato/quad-prog-vpsc.ts +7 -5
- package/src/layout/neato/sgd.ts +2 -1
- package/src/layout/neato/smart-ini-x.ts +15 -15
- package/src/layout/neato/stress-subspace.ts +5 -5
- package/src/layout/sfdp/__fixtures__/dim/dim3-dimen3.dot +6 -6
- package/src/layout/sfdp/__fixtures__/dim/dim3.dot +6 -6
- package/src/layout/sfdp/__fixtures__/dim/dim4-dimen4.dot +6 -6
- package/src/layout/sfdp/__fixtures__/dim/overlap-prism-dim3.dot +6 -6
- package/src/layout/sfdp/__fixtures__/dim/regen.sh +2 -0
- package/src/model/cgraph-ops.ts +4 -3
- package/src/model/edge.ts +11 -4
- package/src/model/edgeInfo.ts +18 -2
- package/src/model/graph.ts +4 -3
- package/src/model/lazy-attrs.ts +3 -1
- package/src/model/rankEntry.ts +3 -1
- package/src/ortho/index.ts +0 -1
- package/src/ortho/partition.ts +10 -22
- package/src/parser/builder.ts +12 -3
- package/src/pathplan/route.ts +14 -4
- package/src/render/dot/agwrite.ts +45 -18
- package/src/render/dot/attrs.ts +18 -7
- package/src/render/dot/types.ts +7 -2
- package/src/render/dot/write-back.ts +27 -3
- package/src/render/dot/xdot-ops.ts +25 -56
- package/src/render/dot.ts +7 -5
- package/src/render/json-cluster-edge.ts +42 -5
- package/src/render/json-nonfinite.ts +51 -0
- package/src/render/json.ts +23 -26
- package/src/render/map.ts +3 -0
- package/src/render/svg-graph.ts +3 -15
- package/src/render/svg-id.ts +11 -2
- package/src/render/svg.ts +4 -1
- package/src/util/bsd-qsort.ts +2 -1
- package/src/util/overflow.ts +74 -0
- package/src/xdot/parse.ts +9 -19
- package/src/xdot/strtod.ts +167 -0
|
@@ -89,9 +89,17 @@ function samePortsAs(x: Edge, lo: Node, key: { loP: Port; hiP: Port }): boolean
|
|
|
89
89
|
|
|
90
90
|
/**
|
|
91
91
|
* Collect all unrouted non-adjacent same-rank side-port flat edges between e's
|
|
92
|
-
* endpoints that share e's tail/head ports (C portcmp),
|
|
93
|
-
*
|
|
94
|
-
*
|
|
92
|
+
* endpoints that share e's tail/head ports (C portcmp), in C's edgecmp order.
|
|
93
|
+
* Inside one make_flat_edge run every edgecmp key before the last is equal
|
|
94
|
+
* (same main edge, so the same rank and x difference; the same ports through
|
|
95
|
+
* makefwdedge; the same graph type and label), so the order is AGSEQ's,
|
|
96
|
+
* whichever node is on the left. make_flat_edge gives edge i the (i+1)-th
|
|
97
|
+
* route out. This follows C where "left tail first" differed from it
|
|
98
|
+
* (nonadjacent-flat-multi AD-3: "if C's order differs, follow C"; issue #158,
|
|
99
|
+
* 700813). `lo` keys the port match only, not the order. Mirrors
|
|
100
|
+
* edge-route.ts: collectAdjacentFlatGroup with the non-adjacent +
|
|
101
|
+
* identical-port group key.
|
|
102
|
+
* @see lib/dotgen/dotsplines.c:edgecmp
|
|
95
103
|
* @see lib/dotgen/dotsplines.c:dot_splines_ (portcmp 370-373), make_flat_edge
|
|
96
104
|
*/
|
|
97
105
|
export function collectNonAdjacentFlatGroup(e: Edge, g: Graph): Edge[] {
|
|
@@ -106,7 +114,7 @@ export function collectNonAdjacentFlatGroup(e: Edge, g: Graph): Edge[] {
|
|
|
106
114
|
const group = g.edges.filter(
|
|
107
115
|
x => sharesPair(x) && isNonAdjGroupable(x, g) && samePortsAs(x, lo, key)
|
|
108
116
|
&& x.info.label === e.info.label);
|
|
109
|
-
group.sort((a, b) =>
|
|
117
|
+
group.sort((a, b) => a.seq - b.seq);
|
|
110
118
|
return group;
|
|
111
119
|
}
|
|
112
120
|
|
|
@@ -34,13 +34,14 @@ import { getSplineBounds, staleAdjacent } from './edge-route-rank.js';
|
|
|
34
34
|
import { graphRanksep } from './position-aux.js';
|
|
35
35
|
import { Edge as EdgeClass } from '../../model/edge.js';
|
|
36
36
|
import { cloneNode, cloneEdge, cleanupCloneGraph, transformf } from './splines-clone.js';
|
|
37
|
+
import { agsubg } from '../../model/cgraph-ops.js';
|
|
37
38
|
import { dotInitNodeEdge, AUX_INIT_SYMS } from './init.js';
|
|
38
39
|
import { gvPostprocess } from '../../common/postproc.js';
|
|
39
40
|
import { newSpline } from '../../common/splines-clip.js';
|
|
40
41
|
import { mapArrowOpPoints } from '../../common/arrows-shapes-util.js';
|
|
41
42
|
import type { ArrowDrawOp } from '../../common/arrows-types.js';
|
|
42
43
|
import { updateBbBz } from '../../common/splines-geom.js';
|
|
43
|
-
import {
|
|
44
|
+
import { updateBB } from './splines-label.js';
|
|
44
45
|
import { NORMAL, VIRTUAL } from './fastgr.js';
|
|
45
46
|
import { EDGE_LABEL } from './rank.js';
|
|
46
47
|
|
|
@@ -110,15 +111,6 @@ export function runAuxSplines(auxg: Graph): number {
|
|
|
110
111
|
// @see lib/dotgen/dotsplines.c:make_flat_adj_edges
|
|
111
112
|
// ---------------------------------------------------------------------------
|
|
112
113
|
|
|
113
|
-
/**
|
|
114
|
-
* Route flat edges between adjacent nodes by running the full dot pipeline
|
|
115
|
-
* on a cloned subgraph (rotated 90°).
|
|
116
|
-
*
|
|
117
|
-
* Acceptance criterion 1: after this call, the cloned graph's nodes have
|
|
118
|
-
* coord set (verified by dotPosition setting ND_coord).
|
|
119
|
-
*
|
|
120
|
-
* @see lib/dotgen/dotsplines.c:make_flat_adj_edges
|
|
121
|
-
*/
|
|
122
114
|
/** Aux graph + the two cloned endpoints + original→aux edge map. */
|
|
123
115
|
interface FlatAux { auxg: Graph; auxt: Node; auxh: Node; alg: Map<Edge, Edge>; }
|
|
124
116
|
|
|
@@ -165,15 +157,16 @@ function cloneFlatEdge(auxg: Graph, tn: Node, auxt: Node, auxh: Node, orig: Edge
|
|
|
165
157
|
* @see lib/dotgen/dotsplines.c:setflags (FLATEDGE order predicate)
|
|
166
158
|
* @see lib/dotgen/dotsplines.c:make_flat_edge (makefwdedge of *edges)
|
|
167
159
|
*/
|
|
168
|
-
function flatLeadPair(edges: Edge[]): { tn: Node; hn: Node } {
|
|
160
|
+
export function flatLeadPair(edges: Edge[]): { tn: Node; hn: Node } {
|
|
169
161
|
const t = edges[0].tail, h = edges[0].head;
|
|
170
162
|
return (t.info.order ?? 0) < (h.info.order ?? 0) ? { tn: t, hn: h } : { tn: h, hn: t };
|
|
171
163
|
}
|
|
172
164
|
|
|
173
165
|
/**
|
|
174
|
-
* Build the rotated auxiliary graph: clone tail
|
|
166
|
+
* Build the rotated auxiliary graph: clone the tail into the `rank=source`
|
|
167
|
+
* subgraph `xxx` and the head into the aux root, clone each edge, then add a
|
|
175
168
|
* heavy ordering edge so the pair lands on adjacent ranks.
|
|
176
|
-
* @see lib/dotgen/dotsplines.c:make_flat_adj_edges (clone + hvye)
|
|
169
|
+
* @see lib/dotgen/dotsplines.c:make_flat_adj_edges 1177-1185 (subg, clone + hvye)
|
|
177
170
|
*/
|
|
178
171
|
function buildFlatAux(g: Graph, edges: Edge[], cnt: number): FlatAux {
|
|
179
172
|
const { tn: ltn, hn: lhn } = flatLeadPair(edges);
|
|
@@ -183,7 +176,9 @@ function buildFlatAux(g: Graph, edges: Edge[], cnt: number): FlatAux {
|
|
|
183
176
|
// cloned from — so the orientation test in cloneFlatEdge matches C.
|
|
184
177
|
const refTn = flip ? lhn : ltn;
|
|
185
178
|
const auxg = cloneGraph(g);
|
|
186
|
-
const
|
|
179
|
+
const subg = agsubg(auxg, 'xxx', true)!;
|
|
180
|
+
subg.attrs.set('rank', 'source');
|
|
181
|
+
const auxt = cloneNode(subg, refTn);
|
|
187
182
|
const auxh = cloneNode(auxg, flip ? ltn : lhn);
|
|
188
183
|
const alg = new Map<Edge, Edge>();
|
|
189
184
|
let hvye: Edge | null = null;
|
|
@@ -374,11 +369,6 @@ export function makeFlatAdjEdges(g: Graph, edges: Edge[], cnt: number, et: numbe
|
|
|
374
369
|
repositionFlatAux(g, edges, aux);
|
|
375
370
|
dotSameports(aux.auxg);
|
|
376
371
|
dotSplines_(aux.auxg, false);
|
|
377
|
-
// The labeled chain edge routes in routeDotEdges (after dotSplines_'s own
|
|
378
|
-
// label pass), so recover_slack repositions the label vnode only afterward.
|
|
379
|
-
// Re-place the aux labels here to read the final vnode coords (DOT-12).
|
|
380
|
-
// @see lib/dotgen/dotsplines.c:make_regular_edge (recover_slack before place_vnlabel)
|
|
381
|
-
placeRegularEdgeLabels(aux.auxg);
|
|
382
372
|
gvPostprocess(aux.auxg);
|
|
383
373
|
copyFlatSplines(g, edges, aux);
|
|
384
374
|
cleanupCloneGraph(aux.auxg);
|
|
@@ -115,10 +115,12 @@ function dispatchEdgeGroup(g: Graph, group: Edge[], ctx: GroupRouteCtx): void {
|
|
|
115
115
|
const uniq = dedupByOrig(group);
|
|
116
116
|
// Flat group: route HERE at its edgecmp position, as C's make_flat_edge call
|
|
117
117
|
// does, so it reads vnodes before later regular edges' recover_slack moves
|
|
118
|
-
// them.
|
|
118
|
+
// them. Each member carries the run (C's `edges + ind`, `cnt`): the
|
|
119
|
+
// flat-adjacent router takes its group from it, in this order, and the other
|
|
120
|
+
// flat routers gather their own group; all skip routed members.
|
|
119
121
|
// @see lib/dotgen/dotsplines.c:dot_splines_ (410-411)
|
|
120
122
|
if (nodeRankOf(e0.tail) === nodeRankOf(e0.head)) {
|
|
121
|
-
for (const e of uniq) routeLoneEdge(e, g);
|
|
123
|
+
for (const e of uniq) routeLoneEdge(e, g, uniq);
|
|
122
124
|
return;
|
|
123
125
|
}
|
|
124
126
|
// Lone edge: route HERE at its edgecmp position (interleaved with groups), as C
|
|
@@ -139,7 +141,7 @@ function dispatchEdgeGroup(g: Graph, group: Edge[], ctx: GroupRouteCtx): void {
|
|
|
139
141
|
const lone = resolveOrigEdge(uniq[0]);
|
|
140
142
|
// Plain chains (no interior splineMerge boundary) keep the whole-chain
|
|
141
143
|
// routers. @see dotsplines.c:make_regular_edge (spline_merge)
|
|
142
|
-
routeLoneEdge(lone, g);
|
|
144
|
+
routeLoneEdge(lone, g, uniq);
|
|
143
145
|
return;
|
|
144
146
|
}
|
|
145
147
|
// Lane offsets follow the edgecmp collected order — C passes the sorted list
|
|
@@ -89,19 +89,18 @@ export function isStraightContinuation(v: Node, n: Node): boolean {
|
|
|
89
89
|
return nodeCoordX(v) === nodeCoordX(n);
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
/**
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
/** @see lib/dotgen/dotsplines.c:straight_len */
|
|
92
|
+
/**
|
|
93
|
+
* Count of vertically aligned edges starting at n. The walk stops at a node
|
|
94
|
+
* with no out edge: 16.1.1 loops on `ND_out(v).size > 0`, where 16.1.0 read
|
|
95
|
+
* `ND_out(v).list[0]` of a virtual node that has none (upstream issue 2765).
|
|
96
|
+
* @see lib/dotgen/dotsplines.c:straight_len (16.1.1, 5649d079c)
|
|
97
|
+
*/
|
|
99
98
|
export function straightLen(n: Node): number {
|
|
100
99
|
let cnt = 0;
|
|
101
|
-
let v: Node
|
|
102
|
-
|
|
103
|
-
v =
|
|
104
|
-
if (!
|
|
100
|
+
let v: Node = n;
|
|
101
|
+
while (nodeOutSize(v) > 0) {
|
|
102
|
+
v = v.info.out!.list[0].head;
|
|
103
|
+
if (!isStraightContinuation(v, n)) break;
|
|
105
104
|
cnt++;
|
|
106
105
|
}
|
|
107
106
|
return cnt;
|
|
@@ -30,6 +30,7 @@ import { midPointf } from './compound-geom.js';
|
|
|
30
30
|
import { placePortlabel, updateBB } from './splines-label.js';
|
|
31
31
|
import { dotRoot } from './mincross-utils.js';
|
|
32
32
|
import { nodesInSeq } from './decomp.js';
|
|
33
|
+
import { fdivOverflow } from '../../util/overflow.js';
|
|
33
34
|
|
|
34
35
|
// Edge-type values, mirroring the constants in splines.ts. Defined locally to
|
|
35
36
|
// avoid a straight-edges ↔ splines import cycle (splines.ts imports
|
|
@@ -174,10 +175,10 @@ function getCycleCentroid(g: Graph, edge: Edge): Point {
|
|
|
174
175
|
|
|
175
176
|
// ---------------------------------------------------------------------------
|
|
176
177
|
// bend — pull the two interior control points toward the centroid
|
|
177
|
-
// @see lib/common/routespl.c:
|
|
178
|
+
// @see lib/common/routespl.c:937-951
|
|
178
179
|
// ---------------------------------------------------------------------------
|
|
179
180
|
|
|
180
|
-
/** @see lib/common/routespl.c:
|
|
181
|
+
/** @see lib/common/routespl.c:937-951 (bend) */
|
|
181
182
|
function bend(spl: Point[], centroid: Point): void {
|
|
182
183
|
const midpt = midPointf(spl[0], spl[3]);
|
|
183
184
|
const distVal = dist(spl[3], spl[0]); // DIST(spl[3], spl[0])
|
|
@@ -185,7 +186,8 @@ function bend(spl: Point[], centroid: Point): void {
|
|
|
185
186
|
const vX = centroid.x - midpt.x;
|
|
186
187
|
const vY = centroid.y - midpt.y;
|
|
187
188
|
const magV = Math.hypot(vX, vY);
|
|
188
|
-
|
|
189
|
+
// avoid out of range division results
|
|
190
|
+
if (fdivOverflow(vX, magV) === null || fdivOverflow(vY, magV) === null) return;
|
|
189
191
|
const ax = midpt.x - (vX / magV) * r; // + would be closest point
|
|
190
192
|
const ay = midpt.y - (vY / magV) * r;
|
|
191
193
|
// this can be improved
|
package/src/layout/fdp/ports.ts
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
*/
|
|
13
13
|
|
|
14
14
|
import { InternalError } from '../../errors.js';
|
|
15
|
+
import { fma } from '../../common/fma.js';
|
|
15
16
|
import type { Graph } from '../../model/graph.js';
|
|
16
17
|
import type { Node } from '../../model/node.js';
|
|
17
18
|
import type { Edge } from '../../model/edge.js';
|
|
@@ -76,7 +77,8 @@ export function getEdgeList(n: Node, g: Graph): Erec[] {
|
|
|
76
77
|
const m = e.head === n ? e.tail : e.head;
|
|
77
78
|
const dx = m.info.pos![0]! - n.info.pos![0]!;
|
|
78
79
|
const dy = m.info.pos![1]! - n.info.pos![1]!;
|
|
79
|
-
|
|
80
|
+
// contracted (-ffp-contract=on): fmadd of the first product
|
|
81
|
+
erecs.push({ e, alpha: Math.atan2(dy, dx), dist2: fma(dx, dx, dy * dy) });
|
|
80
82
|
}
|
|
81
83
|
if (erecs.length !== deg) {
|
|
82
84
|
throw new InternalError(`fdp getEdgeList: ${erecs.length} edges vs deg ${deg}`);
|
|
@@ -107,7 +109,9 @@ export function genPorts(
|
|
|
107
109
|
const fwd = n.id < other.id;
|
|
108
110
|
const fan = fwd
|
|
109
111
|
? { i: idx, inc: 1, angle: er.alpha, delta }
|
|
110
|
-
: {
|
|
112
|
+
: { // contracted (-ffp-contract=on): angle += delta * (cnt - 1) is one fmadd
|
|
113
|
+
i: idx + cnt - 1, inc: -1, angle: fma(delta, cnt - 1, er.alpha), delta: -delta,
|
|
114
|
+
};
|
|
111
115
|
|
|
112
116
|
fillPorts(n, e, pp, fan);
|
|
113
117
|
return idx + cnt;
|
|
@@ -288,6 +288,9 @@ function adjust(g: Graph, temp: number, pp: Bport[] | null): void {
|
|
|
288
288
|
|
|
289
289
|
/**
|
|
290
290
|
* Lay out one derived component g, respecting its boundary ports.
|
|
291
|
+
* The pinned-node centre ctr is added back to every node unconditionally,
|
|
292
|
+
* as in 16.1.1 (upstream 3135d895a): a -0 coordinate becomes +0 when ctr
|
|
293
|
+
* is zero.
|
|
291
294
|
* @see lib/fdpgen/tlayout.c:fdp_tLayout
|
|
292
295
|
*/
|
|
293
296
|
export function fdpTLayout(g: Graph, xpms: XParams): void {
|
|
@@ -308,11 +311,9 @@ export function fdpTLayout(g: Graph, xpms: XParams): void {
|
|
|
308
311
|
}
|
|
309
312
|
}
|
|
310
313
|
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
n.info.pos![1]! += ctr.y;
|
|
315
|
-
}
|
|
314
|
+
for (const n of g.nodes.values()) {
|
|
315
|
+
n.info.pos![0]! += ctr.x;
|
|
316
|
+
n.info.pos![1]! += ctr.y;
|
|
316
317
|
}
|
|
317
318
|
if (reset) resetParams();
|
|
318
319
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
[{"name":"lap-n12-o-0","n":12,"ortho1":true,"tol":1e-9,"A":[[0.5895765154878608,-0.039461164800450206,0,-0.08150068399845622,0,0,-0.30821019638096914,0,0,-0.0841510774625931,-0.02959932854399085,-0.04665406430140138],[-0.039461164800450206,0.7086447332956595,-0.3700095452950336,-0.06652617557847407,0,0,-0.1771058434387669,0,0,-0.055542004182934764,0,0],[0,-0.3700095452950336,0.5210801996744703,-0.054163506664335725,0,0,0,-0.054285506615415216,0,-0.0426216410996858,0,0],[-0.08150068399845622,-0.06652617557847407,-0.054163506664335725,0.47627177211022675,-0.10513688096155722,0,0,0,0,0,-0.059657523352652786,-0.10928700155475073],[0,0,0,-0.10513688096155722,0.5239118714650006,-0.13136326108360663,-0.07629011612152681,-0.037261076904833317,0,-0.12821613042615354,-0.04564440596732311,0],[0,0,0,0,-0.13136326108360663,1.3133034928678535,-0.29785810376051813,-0.03406507215462625,0,0,-0.8500170558691025,0],[-0.30821019638096914,-0.1771058434387669,0,0,-0.07629011612152681,-0.29785810376051813,0.9519518210237017,-0.03498963679187,-0.057497924530050815,0,0,0],[0,0,-0.054285506615415216,0,-0.037261076904833317,-0.03406507215462625,-0.03498963679187,0.465002908133643,-0.0948670040557368,-0.20953461161116138,0,0],[0,0,0,0,0,0,-0.057497924530050815,-0.0948670040557368,0.1924143828762074,-0.04004945429041982,0,0],[-0.0841510774625931,-0.055542004182934764,-0.0426216410996858,0,-0.12821613042615354,0,0,-0.20953461161116138,-0.04004945429041982,1.6794559125369415,-1.119340993463993,0],[-0.02959932854399085,0,0,-0.059657523352652786,-0.04564440596732311,-0.8500170558691025,0,0,0,-1.119340993463993,2.6749298394925427,-0.5706705322954804],[-0.04665406430140138,0,0,-0.10928700155475073,0,0,0,0,0,0,-0.5706705322954804,0.7266115981516325]],"x0":[4.772211939562112,0.7927018590271473,1.5128950797952712,-3.4238022565841675,3.7941597122699022,3.1258598202839494,-1.281523508951068,-3.285185571294278,-0.5091624381020665,-1.3125220476649702,-0.2386066596955061,3.4209661604836583],"b":[0.7895404016599059,1.9576878994703293,1.8271698812022805,0.38161576446145773,0.9235279196873307,1.2639092104509473,-1.1290772827342153,-0.004971648566424847,-1.7915486730635166,-1.7398950131610036,0.9907408049330115,-0.7458298904821277],"rv":0,"x":[1.087446249273795,6.314525888707245,7.372024118884335,2.1692015471039823,1.2182188826774196,0.48611680905967586,-0.4911001467934897,-2.7322748009602402,-12.298751032946107,-1.5121847027881123,-0.3755929745557591,-1.2376298376627528],"iterations":12,"xAfter2":[0.6765795203461091,2.2989519480552683,2.1215575285643538,0.10499816261711725,1.0526803886354468,0.578427223963896,0.5735901367749903,-2.2132643043207247,-4.563930645122978,0.14458955767758397,0.28398542682711647,-1.0581649440181806]},{"name":"lap-n16-o-0","n":16,"ortho1":true,"tol":1e-9,"A":[[2.4126208811261067,-0.08069287897605035,-0.05951889492571354,-0.271126059058588,0,0,0,-0.7537549152038991,0,0,0,-0.9269210868515074,0,-0.0347796477843076,-0.11226045901680158,-0.1735669393092394],[-0.08069287897605035,0.2113730589206615,-0.09362872641941067,0,0,0,0,0,0,0,-0.037051453525200485,0,0,0,0,0],[-0.05951889492571354,-0.09362872641941067,0.3676277015419651,-0.10359254805371165,0,-0.06234850871583653,0,0,-0.04853902342729271,0,0,0,0,0,0,0],[-0.271126059058588,0,-0.10359254805371165,0.7439348799849136,-0.07633405632805079,0,0,0,0,0,0,0,-0.11890817128328812,-0.17397404526127502,0,0],[0,0,0,-0.07633405632805079,0.8551611566282291,-0.33957375545287505,-0.36380182206630707,0,-0.07545152278099622,0,0,0,0,0,0,0],[0,0,-0.06234850871583653,0,-0.33957375545287505,0.6962769472578333,-0.03759086357429624,0,0,0,0,-0.039263155097141865,0,-0.11203475744049582,-0.039787154542282224,-0.06567875243490562],[0,0,0,0,-0.36380182206630707,-0.03759086357429624,0.5719536344386871,-0.040985635336255655,-0.05304197121586185,0,-0.0765333422459662,0,0,0,0,0],[-0.7537549152038991,0,0,0,0,0,-0.040985635336255655,1.424451986424392,-0.051071594012901185,-0.5786398418713361,0,0,0,0,0,0],[0,0,-0.04853902342729271,0,-0.07545152278099622,0,-0.05304197121586185,-0.051071594012901185,0.27524810182519205,-0.047143990388140086,0,0,0,0,0,0],[0,0,0,0,0,0,0,-0.5786398418713361,-0.047143990388140086,1.3085861711881845,-0.22982458141632378,0,-0.04704813233576715,-0.1940182140097022,-0.0740103836869821,-0.13790102747993335],[0,-0.037051453525200485,0,0,0,0,-0.0765333422459662,0,0,-0.22982458141632378,0.6904857305134646,-0.3470763533259742,0,0,0,0],[-0.9269210868515074,0,0,0,0,-0.039263155097141865,0,0,0,0,-0.3470763533259742,1.779749499780268,-0.29041545948712155,-0.06236265784536954,0,-0.11371078717315362],[0,0,0,-0.11890817128328812,0,0,0,0,0,-0.04704813233576715,0,-0.29041545948712155,0.5230931308397299,-0.042913049571216104,-0.023808318162336944,0],[-0.0347796477843076,0,0,-0.17397404526127502,0,-0.11203475744049582,0,0,0,-0.1940182140097022,0,-0.06236265784536954,-0.042913049571216104,0.644734803286782,-0.024652431374415754,0],[-0.11226045901680158,0,0,0,0,-0.039787154542282224,0,0,0,-0.0740103836869821,0,0,-0.023808318162336944,-0.024652431374415754,0.5014159102158414,-0.2268971634330228],[-0.1735669393092394,0,0,0,0,-0.06567875243490562,0,0,0,-0.13790102747993335,0,-0.11371078717315362,0,0,-0.2268971634330228,0.7177546698302548]],"x0":[3.026115158572793,-1.7199210706166923,-0.5707726674154401,3.772675460204482,2.3043943964876235,1.791331171989441,-2.796054733917117,-2.4172244407236576,0.9610486100427806,-3.1542145926505327,-0.7206386211328208,2.1843289211392403,4.418198245111853,-1.5508726076222956,4.41932488931343,-0.2781595499254763],"b":[1.142309253104031,1.8210667874664068,1.352941663004458,1.2772243553772569,-1.0777961574494839,0.318919338285923,-0.5900919632986188,1.4360994510352612,1.855077350512147,-0.3908750955015421,-1.57783870305866,0.051539949141442776,-0.8355367304757237,1.5577635820955038,1.4906468419358134,-1.9117703158408403],"rv":0,"x":[0.259060038369535,8.787837485452938,5.688814104458801,1.5913219436027883,-3.655060787294647,-1.782445324207453,-4.207206852963672,0.43406090389907803,4.459807074831501,-1.2070077032506656,-3.9705713875331647,-1.4982718115904892,-2.7660513656844237,1.2930122344038066,0.24423024327886528,-3.671528795772911],"iterations":16,"xAfter2":[0.39983898364148485,0.911693775830438,1.621035957770452,1.562017395790261,-3.0327527065353497,-0.040379701745647645,-1.7138580624657096,1.4361224539777075,2.0579300882880256,-0.016303865981254884,-3.6114906624565295,-1.5772394572493005,-0.16560093779831897,2.267797845327718,2.1139523434115626,-2.212763449805541]},{"name":"spd-n7-x-0","n":7,"ortho1":false,"tol":1e-9,"A":[[4.034613722417752,0.2298196113713734,-0.9219828264424246,-0.013815859530068253,-1.3865535345160371,-0.31073911186364445,0.6521996743148534],[0.2298196113713734,3.590471767018313,-0.5130167948595615,-0.33385268645539135,1.2064451437066706,-0.7203739706194086,0.4182006076346406],[-0.9219828264424246,-0.5130167948595615,4.068883210848087,-1.263541190651591,-0.06890260826293546,-0.387238971381509,-1.1046754521941897],[-0.013815859530068253,-0.33385268645539135,-1.263541190651591,2.6783342420780234,0.17093316657544272,-0.14526428621746823,-0.3207896702055313],[-1.3865535345160371,1.2064451437066706,-0.06890260826293546,0.17093316657544272,3.454293615319042,0.08086906626238174,-0.029709111664647538],[-0.31073911186364445,-0.7203739706194086,-0.387238971381509,-0.14526428621746823,0.08086906626238174,1.8253873856523308,0.525017734646975],[0.6521996743148534,0.4182006076346406,-1.1046754521941897,-0.3207896702055313,-0.029709111664647538,0.525017734646975,2.091780217663192]],"x0":[0.44189647072926164,2.6739507471211255,-2.449234009254724,-0.45764289563521743,-4.473772342316806,0.26105146622285247,4.7245881566777825],"b":[0.8726040311157703,-1.971606739796698,1.6071469793096185,0.6793537372723222,-1.3376270467415452,-0.38025564327836037,1.1462761806324124],"rv":0,"x":[0.16097782792356216,-0.5900174713296901,0.8971926881426485,0.7420676171301357,-0.11111806424895919,-0.5444096491980537,1.3384341249069727],"iterations":7,"xAfter2":[-0.3043240448799529,-0.384612181330626,0.8231170330981888,1.3753551977852279,-0.8038554037702796,-0.4908716658976997,1.2178139421735092]},{"name":"spd-n13-x-1","n":13,"ortho1":false,"tol":0.001,"A":[[5.447421912462957,-1.8496876854335307,0.3707103474764254,-0.006962196318368252,-2.6262994724078546,0.9584274187424752,-2.623516548513402,0.33216638157969774,2.0194522450516996,-0.7701083843937973,-0.9245604593109267,1.3150720302244632,2.4020772171412452],[-1.8496876854335307,4.280122352978987,-1.1049864661325821,1.0819466246603062,0.5837942978678722,0.23140924060052342,2.59142579107278,-0.09362737804576732,-1.492679052821738,-0.6587005682930346,0.8285901465951603,-1.2386603235432772,-1.4823997194669516],[0.3707103474764254,-1.1049864661325821,4.912573934788907,2.13309444058648,0.24784757397034213,-1.599044259995584,-2.1889690694038837,1.4305807088008913,0.7904934908680374,3.2357175618499388,-1.1425629633585708,-0.10078628560017133,0.9492209387833604],[-0.006962196318368252,1.0819466246603062,2.13309444058648,6.661565581808841,0.4820267169972903,-0.12577149687179284,1.358914832773964,0.8940753439636413,-1.2388191627119758,1.8594592414899072,0.7310871227141171,-0.23382998635001018,-0.09485498823267469],[-2.6262994724078546,0.5837942978678722,0.24784757397034213,0.4820267169972903,6.055883990584786,-0.26598072515165877,0.28615703378815405,-1.2019280457209676,-0.1224628713045284,1.0306795440476901,1.1249026300767189,-2.3777912809852246,0.8165833389105974],[0.9584274187424752,0.23140924060052342,-1.599044259995584,-0.12577149687179284,-0.26598072515165877,5.153074274283106,1.2198184897019009,-0.6489539625954936,-0.6334863271592424,-4.583548482065578,-1.1595267607286912,-0.2889361261035472,0.2519284973058902],[-2.623516548513402,2.59142579107278,-2.1889690694038837,1.358914832773964,0.28615703378815405,1.2198184897019009,6.560118465693668,-0.4199294176638841,-3.652134080478937,-1.895715229787074,0.4352308192143296,0.5094576760734885,-3.348525587986341],[0.33216638157969774,-0.09362737804576732,1.4305807088008913,0.8940753439636413,-1.2019280457209676,-0.6489539625954936,-0.4199294176638841,4.475986521456179,0.5967552943691808,-0.1725662189772682,-0.9743107632234973,2.1762686360144414,-1.0329442639369184],[2.0194522450516996,-1.492679052821738,0.7904934908680374,-1.2388191627119758,-0.1224628713045284,-0.6334863271592424,-3.652134080478937,0.5967552943691808,4.77403760509449,-0.03257179341984073,0.1127885254511038,0.023247721871051674,2.6047129837876324],[-0.7701083843937973,-0.6587005682930346,3.2357175618499388,1.8594592414899072,1.0306795440476901,-4.583548482065578,-1.895715229787074,-0.1725662189772682,-0.03257179341984073,7.978192220873173,1.1682861339848085,-0.9387402157825487,0.6044240130429457],[-0.9245604593109267,0.8285901465951603,-1.1425629633585708,0.7310871227141171,1.1249026300767189,-1.1595267607286912,0.4352308192143296,-0.9743107632234973,0.1127885254511038,1.1682861339848085,6.5042947882993865,0.6693659789508722,1.1086281616213856],[1.3150720302244632,-1.2386603235432772,-0.10078628560017133,-0.23382998635001018,-2.3777912809852246,-0.2889361261035472,0.5094576760734885,2.1762686360144414,0.023247721871051674,-0.9387402157825487,0.6693659789508722,6.159410395737019,-0.3853331995356897],[2.4020772171412452,-1.4823997194669516,0.9492209387833604,-0.09485498823267469,0.8165833389105974,0.2519284973058902,-3.348525587986341,-1.0329442639369184,2.6047129837876324,0.6044240130429457,1.1086281616213856,-0.3853331995356897,4.9361444401708665]],"x0":[-0.5694711580872536,3.91966046532616,4.978114303667098,-1.5043403068557382,-2.1934599452652037,3.6679056473076344,-2.642771659884602,-2.9983127396553755,2.709529767744243,-2.3165216110646725,-1.6407919046469033,-0.6960662500932813,3.9623036747798324],"b":[-1.9249284965917468,0.6617018720135093,1.6592920161783695,1.9732861230149865,0.10042935609817505,-1.883204722777009,0.4292549788951874,-0.0833835955709219,-0.1368865082040429,-1.6872476115822792,1.5489583583548665,-0.1651842314749956,-0.4895575027912855],"rv":0,"x":[-0.47133903360765605,-0.14882962807398673,0.9686574257574599,0.5435612779594865,-0.2581398122755388,-1.5233967239697328,-0.2661592280367592,-0.6094280735287261,-0.23710061843299599,-1.7754031963664032,0.3427019045024473,-0.16190040082663093,-0.025090922058416194],"iterations":11,"xAfter2":[-1.9519359675191583,2.5973024291190057,3.439522052892111,-0.6287082463082667,-1.745668469566447,0.2837987764405978,-0.3184445296055677,-1.562501913575384,0.6742659406042001,-0.3208496416038299,0.38432081969360155,1.5899444142479924,0.8924446883762849]},{"name":"lap-n22-x-1","n":22,"ortho1":false,"tol":0.001,"A":[[1.1275156191508156,-0.24563007889082655,0,0,0,0,-0.041902415743097665,-0.036683603684650734,0,0,0,-0.5873497456777841,-0.07414262440579478,-0.09159078715472585,-0.05021636359393597,0,0,0,0,0,0,0],[-0.24563007889082655,3.466100875029806,-1.1092032170854509,0,-0.1577388882287778,0,-0.3618223444209434,0,0,0,0,0,0,0,0,-0.6470747676212341,0,-0.9176351868081838,0,0,0,-0.026996391974389553],[0,-1.1092032170854509,4.0261883379565555,-0.25490386685123667,0,-0.2513225848088041,0,0,0,0,0,-0.030811301721259954,0,-0.5656666769646108,0,-1.234586396953091,0,0,-0.35567714291391894,0,-0.1814768851036206,-0.04254026555456221],[0,0,-0.25490386685123667,3.578618344514527,-0.3067826319602318,0,0,0,0,-0.2983898631064221,0,0,-0.2517814204329625,0,-0.14137594764017394,0,-1.0267326426692307,-0.757148721255362,0,-0.5415032505989075,0,0],[0,-0.1577388882287778,0,-0.3067826319602318,0.9421127532262148,-0.04002901321277023,0,0,0,0,0,0,0,0,-0.3472938663326204,0,0,-0.0902683534918146,0,0,0,0],[0,0,-0.2513225848088041,0,-0.04002901321277023,1.7756947911760976,-0.7089983120094985,-0.20330273284344003,0,0,0,0,0,0,0,0,-0.13039832769168747,0,0,-0.19050297420471907,-0.2511408464051783,0],[-0.041902415743097665,-0.3618223444209434,0,0,0,-0.7089983120094985,1.3977549531828843,-0.02807143038138747,0,-0.16533673176309094,0,-0.09162371886486653,0,0,0,0,0,0,0,0,0,0],[-0.036683603684650734,0,0,0,0,-0.20330273284344003,-0.02807143038138747,1.9225898190878798,-0.9132826107088476,-0.1970157348550856,0,0,-0.08748564659617841,0,0,-0.15828577850738332,-0.11997091697735918,-0.12593927659327164,0,0,0,-0.05255208794027567],[0,0,0,0,0,0,0,-0.9132826107088476,4.657700381567702,-1.2491746495943516,0,-1.0348352822475135,0,0,0,0,0,0,0,-1.4374016907531768,0,-0.023006148263812067],[0,0,0,-0.2983898631064221,0,0,-0.16533673176309094,-0.1970157348550856,-1.2491746495943516,2.5620870917337015,-0.19898255018051714,0,-0.3358458150178194,0,0,0,0,0,-0.07637858412635978,-0.04096316309005488,0,0],[0,0,0,0,0,0,0,0,0,-0.19898255018051714,1.5709257257549325,-0.08346609813452233,0,0,0,-1.226235413691029,-0.062241663748864084,0,0,0,0,0],[-0.5873497456777841,0,-0.030811301721259954,0,0,0,-0.09162371886486653,0,-1.0348352822475135,0,-0.08346609813452233,3.6727212206750925,-0.08625189041777048,-0.11983356275595725,-1.404913663631305,0,-0.07347802715958096,-0.037550894347950815,-0.09698004839527938,-0.025626987321302294,0,0],[-0.07414262440579478,0,0,-0.2517814204329625,0,0,0,-0.08748564659617841,0,-0.3358458150178194,0,-0.08625189041777048,1.7130321037833345,-0.04201366299763322,0,0,-0.6094880909658968,0,-0.1725919583113864,0,0,-0.05343099463789258],[-0.09159078715472585,0,-0.5656666769646108,0,0,0,0,0,0,0,0,-0.11983356275595725,-0.04201366299763322,2.0406274194839513,-0.28877469414146617,0,0,0,0,-0.25535686285002157,0,-0.6773911726195365],[-0.05021636359393597,0,0,-0.14137594764017394,-0.3472938663326204,0,0,0,0,0,0,-1.404913663631305,0,-0.28877469414146617,2.41328262312299,-0.07678921506158076,-0.10391887272190715,0,0,0,0,0],[0,-0.6470747676212341,-1.234586396953091,0,0,0,0,-0.15828577850738332,0,0,-1.226235413691029,0,0,0,-0.07678921506158076,3.889901749422683,-0.23991678206948563,0,-0.08564654584915843,0,-0.22136684966972098,0],[0,0,0,-1.0267326426692307,0,-0.13039832769168747,0,-0.11997091697735918,0,0,-0.062241663748864084,-0.07347802715958096,-0.6094880909658968,0,-0.10391887272190715,-0.23991678206948563,3.8485734969953134,-0.13040830332061482,0,-1.2805083179846406,0,-0.07151155168604519],[0,-0.9176351868081838,0,-0.757148721255362,-0.0902683534918146,0,0,-0.12593927659327164,0,0,0,-0.037550894347950815,0,0,0,0,-0.13040830332061482,2.220473279957401,-0.026395194409415127,0,-0.135127349730788,0],[0,0,-0.35567714291391894,0,0,0,0,0,0,-0.07637858412635978,0,-0.09698004839527938,-0.1725919583113864,0,0,-0.08564654584915843,0,-0.026395194409415127,0.9689963266661572,-0.08037474322029285,0,-0.07495210944034625],[0,0,0,-0.5415032505989075,0,-0.19050297420471907,0,0,-1.4374016907531768,-0.04096316309005488,0,-0.025626987321302294,0,-0.25535686285002157,0,0,-1.2805083179846406,0,-0.08037474322029285,3.87627702835902,-0.02403903833590448,0],[0,0,-0.1814768851036206,0,0,-0.2511408464051783,0,0,0,0,0,0,0,0,0,-0.22136684966972098,0,-0.135127349730788,0,-0.02403903833590448,0.8667904910116664,-0.05363952176645398],[0,-0.026996391974389553,-0.04254026555456221,0,0,0,0,-0.05255208794027567,-0.023006148263812067,0,0,0,-0.05343099463789258,-0.6773911726195365,0,0,-0.07151155168604519,0,-0.07495210944034625,0,-0.05363952176645398,1.0760202438833142]],"x0":[-2.8833896294236183,-0.7601512339897454,-3.736793550197035,4.663788846228272,1.2892400124110281,-4.339366427157074,0.7980821491219103,-1.9109987607225776,4.626454939134419,-1.4064031350426376,-1.9097989215515554,-0.6688290066085756,-3.758049055468291,2.0024234103038907,1.501791593618691,-1.867313259281218,-1.079188333824277,3.700506871100515,-4.837537070270628,-4.750217178370804,-1.5736462455242872,3.242315270472318],"b":[1.474394442513585,-0.003444395959377289,-1.8723840806633234,-1.5507755037397146,0.30775403417646885,0.5493125645443797,-1.6076116133481264,-1.4078073017299175,1.9793369406834245,-1.8257866520434618,-0.5090454425662756,-0.22244143206626177,1.4440426789224148,1.4507308769971132,0.30059059150516987,1.3088521622121334,1.8021909007802606,0.785375127568841,1.4956082459539175,-0.6545194154605269,1.2779389070346951,-0.5823440635576844],"rv":0,"x":[5076321104880563,5076321131798133,5076321135970837,5076321125699139,5076321140868446,5076321126047606,5076321125762636,5076321121537986,5076321097075030,5076321124733811,5076321131007050,5076321127494234,5076321125569804,5076321137092392,5076321121055209,5076321133528097,5076321118016478,5076321129866054,5076321160066077,5076321135899613,5076321123695178,5076321153767257],"iterations":22,"xAfter2":[-0.45074687564978566,-0.26420231205461947,-0.9730968194417056,-1.523053314242791,1.345161146916877,-1.1181788161732502,-2.0697128037242756,-1.2749049021990442,-0.03887948601032265,-1.4977663581136182,-1.8795013091364157,-0.6474156328532747,-0.4215729486577784,0.9115518397093305,0.6222959613264798,-0.9661449092576833,0.5963525664651081,0.3773342367823478,-2.267464928069519,-0.11569972073964735,-0.8130929538316314,1.2001503950999357]}]
|