@tscircuit/hypergraph 0.0.12 → 0.0.14

package/dist/index.d.ts

@@ -63,13 +63,16 @@ type HyperGraph = {
     ports: RegionPort[];
     regions: Region[];
 };
-type SerializedGraphPort = Omit<RegionPort, "edges"> & {
+type SerializedGraphPort = {
     portId: PortId;
     region1Id: RegionId;
     region2Id: RegionId;
+    d: any;
 };
-type SerializedGraphRegion = Omit<Region, "points" | "assignments"> & {
+type SerializedGraphRegion = {
+    regionId: RegionId;
     pointIds: PortId[];
+    d: any;
     assignments?: SerializedRegionPortAssignment[];
 };
 type SerializedRegionPortAssignment = {
@@ -295,11 +298,11 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
         ripCost?: number;
     });
     getConstructorParams(): {
-        inputGraph: HyperGraph | SerializedHyperGraph;
-        inputConnections: (Connection | SerializedConnection)[];
-        greedyMultiplier?: number;
-        rippingEnabled?: boolean;
-        ripCost?: number;
+        inputGraph: SerializedHyperGraph;
+        inputConnections: SerializedConnection[];
+        greedyMultiplier: number;
+        rippingEnabled: boolean;
+        ripCost: number;
     };
     computeH(candidate: CandidateType): number;
     /**
@@ -386,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)[];
@@ -405,6 +409,10 @@ declare class JumperGraphSolver extends HyperGraphSolver<JRegion, JPort> {
     visualize(): GraphicsObject;
 }
 
+declare const convertHyperGraphToSerializedHyperGraph: (graph: HyperGraph) => SerializedHyperGraph;
+
+declare const convertConnectionsToSerializedConnections: (connections: Connection[]) => SerializedConnection[];
+
 /**
  * Applies a transformation matrix to all points in a graph.
  * Transforms region bounds, region centers, and port positions.
@@ -417,4 +425,4 @@ declare const rotateGraph90Degrees: (graph: JumperGraph) => JumperGraph;
 
 declare const calculateGraphBounds: (regions: JRegion[]) => Bounds;
 
-export { type Candidate, type Connection, type ConnectionId, type GScore, type GraphEdgeId, type HyperGraph, HyperGraphSolver, type JPort, type JRegion, JUMPER_GRAPH_SOLVER_DEFAULTS, type JumperGraph, JumperGraphSolver, type JumperGraphWithConnections, type NetworkId, type PortAssignment, type PortId, type Region, type RegionId, type RegionPort, type RegionPortAssignment, type SerializedConnection, type SerializedGraphPort, type SerializedGraphRegion, type SerializedHyperGraph, type SerializedRegionPortAssignment, type SolvedRoute, type XYConnection, applyTransformToGraph, calculateGraphBounds, createGraphWithConnectionsFromBaseGraph, generateJumperGrid, generateJumperX4Grid, rotateGraph90Degrees };
+export { type Candidate, type Connection, type ConnectionId, type GScore, type GraphEdgeId, type HyperGraph, HyperGraphSolver, type JPort, type JRegion, JUMPER_GRAPH_SOLVER_DEFAULTS, type JumperGraph, JumperGraphSolver, type JumperGraphWithConnections, type NetworkId, type PortAssignment, type PortId, type Region, type RegionId, type RegionPort, type RegionPortAssignment, type SerializedConnection, type SerializedGraphPort, type SerializedGraphRegion, type SerializedHyperGraph, type SerializedRegionPortAssignment, type SolvedRoute, type XYConnection, applyTransformToGraph, calculateGraphBounds, convertConnectionsToSerializedConnections, convertHyperGraphToSerializedHyperGraph, createGraphWithConnectionsFromBaseGraph, generateJumperGrid, generateJumperX4Grid, rotateGraph90Degrees };

package/dist/index.js

@@ -1562,6 +1562,36 @@ var convertSerializedHyperGraphToHyperGraph = (inputGraph) => {
   };
 };
 
+// lib/convertHyperGraphToSerializedHyperGraph.ts
+var convertHyperGraphToSerializedHyperGraph = (graph) => {
+  const serializedPorts = graph.ports.map((port) => ({
+    portId: port.portId,
+    region1Id: port.region1.regionId,
+    region2Id: port.region2.regionId,
+    d: port.d
+  }));
+  const serializedRegions = graph.regions.map(
+    (region) => ({
+      regionId: region.regionId,
+      pointIds: region.ports.map((port) => port.portId),
+      d: region.d
+    })
+  );
+  return {
+    ports: serializedPorts,
+    regions: serializedRegions
+  };
+};
+
+// lib/convertConnectionsToSerializedConnections.ts
+var convertConnectionsToSerializedConnections = (connections) => {
+  return connections.map((conn) => ({
+    connectionId: conn.connectionId,
+    startRegionId: conn.startRegion.regionId,
+    endRegionId: conn.endRegion.regionId
+  }));
+};
+
 // lib/convertSerializedConnectionsToConnections.ts
 var convertSerializedConnectionsToConnections = (inputConnections, graph) => {
   const connections = [];
@@ -1768,7 +1798,15 @@ var HyperGraphSolver = class extends BaseSolver {
   lastCandidate = null;
   visitedPointsForCurrentConnection = /* @__PURE__ */ new Map();
   getConstructorParams() {
-    return this.input;
+    return {
+      inputGraph: convertHyperGraphToSerializedHyperGraph(this.graph),
+      inputConnections: convertConnectionsToSerializedConnections(
+        this.connections
+      ),
+      greedyMultiplier: this.greedyMultiplier,
+      rippingEnabled: this.rippingEnabled,
+      ripCost: this.ripCost
+    };
   }
   computeH(candidate) {
     return this.estimateCostToEnd(candidate.port);
@@ -2331,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,
@@ -2360,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() {
@@ -2423,6 +2529,8 @@ export {
   JumperGraphSolver,
   applyTransformToGraph,
   calculateGraphBounds,
+  convertConnectionsToSerializedConnections,
+  convertHyperGraphToSerializedHyperGraph,
   createGraphWithConnectionsFromBaseGraph,
   generateJumperGrid,
   generateJumperX4Grid,

package/package.json

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