@tscircuit/hypergraph 0.0.2 → 0.0.3

package/dist/index.d.ts

@@ -335,9 +335,21 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
 
 declare class JumperGraphSolver extends HyperGraphSolver<JRegion, JPort> {
     UNIT_OF_COST: string;
+    portUsagePenalty: number;
+    portUsagePenaltySq: number;
+    crossingPenalty: number;
+    crossingPenaltySq: number;
+    ripCost: number;
+    baseMaxIterations: number;
+    additionalMaxIterationsPerConnection: number;
     constructor(input: {
         inputGraph: HyperGraph | SerializedHyperGraph;
         inputConnections: (Connection | SerializedConnection)[];
+        ripCost?: number;
+        portUsagePenalty?: number;
+        crossingPenalty?: number;
+        baseMaxIterations?: number;
+        additionalMaxIterationsPerConnection?: number;
     });
     estimateCostToEnd(port: JPort): number;
     getPortUsagePenalty(port: JPort): number;

package/dist/index.js

@@ -2277,23 +2277,36 @@ function computeCrossingAssignments(region, port1, port2) {
 // lib/JumperGraphSolver/JumperGraphSolver.ts
 var JumperGraphSolver = class extends HyperGraphSolver {
   UNIT_OF_COST = "distance";
+  portUsagePenalty = 0.197;
+  portUsagePenaltySq = 0;
+  crossingPenalty = 6.007;
+  crossingPenaltySq = 0.111;
+  ripCost = 40;
+  baseMaxIterations = 4e3;
+  additionalMaxIterationsPerConnection = 2e3;
   constructor(input) {
     super({
-      ...input,
-      greedyMultiplier: 1.2,
+      greedyMultiplier: 0.45,
       rippingEnabled: true,
-      ripCost: 40
+      ...input
     });
-    this.MAX_ITERATIONS = 400 + input.inputConnections.length * 200;
+    this.ripCost = input.ripCost ?? this.ripCost;
+    this.portUsagePenalty = input.portUsagePenalty ?? this.portUsagePenalty;
+    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;
   }
   estimateCostToEnd(port) {
     return distance(port.d, this.currentEndRegion.d.center);
   }
   getPortUsagePenalty(port) {
-    return port.ripCount ?? 0;
+    const ripCount = port.ripCount ?? 0;
+    return ripCount * this.portUsagePenalty + ripCount * this.portUsagePenaltySq;
   }
   computeIncreasedRegionCostIfPortsAreUsed(region, port1, port2) {
-    return computeDifferentNetCrossings(region, port1, port2) * 6;
+    const crossings = computeDifferentNetCrossings(region, port1, port2);
+    return crossings * this.crossingPenalty + crossings * this.crossingPenaltySq;
   }
   getRipsRequiredForPortUsage(region, port1, port2) {
     const crossingAssignments = computeCrossingAssignments(region, port1, port2);

package/package.json

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