@tscircuit/hypergraph 0.0.13 → 0.0.14

package/dist/index.d.ts

@@ -389,6 +389,7 @@ declare class JumperGraphSolver extends HyperGraphSolver<JRegion, JPort> {
     ripCost: number;
     baseMaxIterations: number;
     additionalMaxIterationsPerConnection: number;
+    additionalMaxIterationsPerCrossing: number;
     constructor(input: {
         inputGraph: HyperGraph | SerializedHyperGraph;
         inputConnections: (Connection | SerializedConnection)[];

package/dist/index.js

@@ -2369,24 +2369,88 @@ function computeCrossingAssignments(region, port1, port2) {
   return crossingAssignments;
 }
 
+// lib/JumperGraphSolver/countInputConnectionCrossings.ts
+function countInputConnectionCrossings(graph, connections) {
+  if (connections.length < 2) {
+    return 0;
+  }
+  let minX = Infinity;
+  let maxX = -Infinity;
+  let minY = Infinity;
+  let maxY = -Infinity;
+  for (const region of graph.regions) {
+    const jRegion = region;
+    if (jRegion.d?.bounds) {
+      minX = Math.min(minX, jRegion.d.bounds.minX);
+      maxX = Math.max(maxX, jRegion.d.bounds.maxX);
+      minY = Math.min(minY, jRegion.d.bounds.minY);
+      maxY = Math.max(maxY, jRegion.d.bounds.maxY);
+    } else if (jRegion.d?.center) {
+      minX = Math.min(minX, jRegion.d.center.x);
+      maxX = Math.max(maxX, jRegion.d.center.x);
+      minY = Math.min(minY, jRegion.d.center.y);
+      maxY = Math.max(maxY, jRegion.d.center.y);
+    }
+  }
+  const regionCenterMap = /* @__PURE__ */ new Map();
+  for (const region of graph.regions) {
+    const jRegion = region;
+    if (jRegion.d?.center) {
+      regionCenterMap.set(region.regionId, jRegion.d.center);
+    }
+  }
+  const chords = [];
+  for (const conn of connections) {
+    let startCenter;
+    let endCenter;
+    if ("startRegion" in conn && conn.startRegion) {
+      const startRegion = conn.startRegion;
+      const endRegion = conn.endRegion;
+      startCenter = startRegion.d?.center;
+      endCenter = endRegion.d?.center;
+    } else if ("startRegionId" in conn) {
+      startCenter = regionCenterMap.get(conn.startRegionId);
+      endCenter = regionCenterMap.get(conn.endRegionId);
+    }
+    if (!startCenter || !endCenter) {
+      continue;
+    }
+    const t1 = perimeterT(startCenter, minX, maxX, minY, maxY);
+    const t2 = perimeterT(endCenter, minX, maxX, minY, maxY);
+    chords.push([t1, t2]);
+  }
+  let crossings = 0;
+  for (let i = 0; i < chords.length; i++) {
+    for (let j = i + 1; j < chords.length; j++) {
+      if (chordsCross(chords[i], chords[j])) {
+        crossings++;
+      }
+    }
+  }
+  return crossings;
+}
+
 // lib/JumperGraphSolver/JumperGraphSolver.ts
 var JUMPER_GRAPH_SOLVER_DEFAULTS = {
-  portUsagePenalty: 0.06393718451067248,
-  portUsagePenaltySq: 0.06194817180037216,
-  crossingPenalty: 6.0761550028071145,
-  crossingPenaltySq: 0.1315528159128946,
-  ripCost: 40.00702225250195,
-  greedyMultiplier: 0.4316469416682083
+  portUsagePenalty: 0.034685181009478865,
+  // portUsagePenaltySq: 0.06194817180037216,
+  portUsagePenaltySq: 0,
+  crossingPenalty: 4.072520483177124,
+  crossingPenaltySq: 0,
+  // crossingPenaltySq: 0.1315528159128946,
+  ripCost: 35.38577539020022,
+  greedyMultiplier: 0.5518001238069296
 };
 var JumperGraphSolver = class extends HyperGraphSolver {
-  UNIT_OF_COST = "distance";
+  UNIT_OF_COST = "hops";
   portUsagePenalty = JUMPER_GRAPH_SOLVER_DEFAULTS.portUsagePenalty;
   portUsagePenaltySq = JUMPER_GRAPH_SOLVER_DEFAULTS.portUsagePenaltySq;
   crossingPenalty = JUMPER_GRAPH_SOLVER_DEFAULTS.crossingPenalty;
   crossingPenaltySq = JUMPER_GRAPH_SOLVER_DEFAULTS.crossingPenaltySq;
   ripCost = JUMPER_GRAPH_SOLVER_DEFAULTS.ripCost;
   baseMaxIterations = 4e3;
-  additionalMaxIterationsPerConnection = 4e3;
+  additionalMaxIterationsPerConnection = 2e3;
+  additionalMaxIterationsPerCrossing = 2e3;
   constructor(input) {
     super({
       greedyMultiplier: JUMPER_GRAPH_SOLVER_DEFAULTS.greedyMultiplier,
@@ -2398,7 +2462,11 @@ var JumperGraphSolver = class extends HyperGraphSolver {
     this.crossingPenalty = input.crossingPenalty ?? this.crossingPenalty;
     this.baseMaxIterations = input.baseMaxIterations ?? this.baseMaxIterations;
     this.additionalMaxIterationsPerConnection = input.additionalMaxIterationsPerConnection ?? this.additionalMaxIterationsPerConnection;
-    this.MAX_ITERATIONS = this.baseMaxIterations + input.inputConnections.length * this.additionalMaxIterationsPerConnection;
+    const crossings = countInputConnectionCrossings(
+      this.graph,
+      input.inputConnections
+    );
+    this.MAX_ITERATIONS = this.baseMaxIterations + input.inputConnections.length * this.additionalMaxIterationsPerConnection + crossings * this.additionalMaxIterationsPerCrossing;
     this.populateDistanceToEndMaps();
   }
   populateDistanceToEndMaps() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tscircuit/hypergraph",
   "main": "dist/index.js",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "scripts": {
     "start": "cosmos",