Merge pull request #4 from tscircuit/stats-display

Add stats display, cost function adjustment to penalize for high trace counts

Author: seveibar

lib/computeRegionCost.ts

@@ -1,12 +1,14 @@
 const viaSize = 0.45
 const viaSizeSq = viaSize ** 2
+const traceWidth = 0.1
 
 export const computeRegionCost = (
   regionWidth: number,
   regionHeight: number,
   numSameLayerIntersections: number,
   numCrossLayerIntersections: number,
   numEntryExitChanges: number,
+  traceCount: number,
 ) => {
   const area = regionWidth * regionHeight
 
@@ -15,5 +17,7 @@ export const computeRegionCost = (
     numCrossLayerIntersections * 1 +
     numEntryExitChanges * 1
 
-  return (estViasRequired * viaSizeSq) / area
+  const traceCountMult = 1 + traceCount / 5
+
+  return (estViasRequired * viaSizeSq * traceCountMult) / area
 }

lib/index.ts

@@ -26,6 +26,7 @@ const createEmptyRegionIntersectionCache = (): RegionIntersectionCache => ({
   existingSameLayerIntersections: 0,
   existingEntryExitLayerChanges: 0,
   existingRegionCost: 0,
+  existingSegmentCount: 0,
 })
 
 export interface TinyHyperGraphTopology {
@@ -138,7 +139,7 @@ export class TinyHyperGraphSolver extends BaseSolver {
 
   RIP_THRESHOLD_START = 0.05
   RIP_THRESHOLD_END = 0.8
-  RIP_THRESHOLD_RAMP_ATTEMPTS = 20
+  RIP_THRESHOLD_RAMP_ATTEMPTS = 50
 
   RIP_CONGESTION_REGION_COST_FACTOR = 0.1
 
@@ -438,6 +439,7 @@ export class TinyHyperGraphSolver extends BaseSolver {
       newCrossLayerIntersections
     const existingEntryExitLayerChanges =
       regionCache.existingEntryExitLayerChanges + newEntryExitLayerChanges
+    const existingSegmentCount = lesserAngles.length
 
     state.regionIntersectionCaches[regionId] = {
       netIds,
@@ -447,12 +449,14 @@ export class TinyHyperGraphSolver extends BaseSolver {
       existingSameLayerIntersections,
       existingCrossingLayerIntersections,
       existingEntryExitLayerChanges,
+      existingSegmentCount,
       existingRegionCost: computeRegionCost(
         topology.regionWidth[regionId],
         topology.regionHeight[regionId],
         existingSameLayerIntersections,
         existingCrossingLayerIntersections,
         existingEntryExitLayerChanges,
+        existingSegmentCount,
       ),
     }
   }
@@ -550,7 +554,10 @@ export class TinyHyperGraphSolver extends BaseSolver {
       ripCount: state.ripCount,
     }
 
-    if (regionIdsOverCostThreshold.length === 0) {
+    if (
+      regionIdsOverCostThreshold.length === 0 ||
+      state.ripCount === this.RIP_THRESHOLD_RAMP_ATTEMPTS
+    ) {
       this.solved = true
       return
     }
@@ -639,6 +646,7 @@ export class TinyHyperGraphSolver extends BaseSolver {
         regionCache.existingCrossingLayerIntersections +
           newCrossLayerIntersections,
         regionCache.existingEntryExitLayerChanges + newEntryExitLayerChanges,
+        regionCache.existingSegmentCount + 1,
       ) - regionCache.existingRegionCost
 
     return (

lib/types.ts

@@ -29,6 +29,7 @@ export interface RegionIntersectionCache extends DynamicAnglePairArrays {
   existingCrossingLayerIntersections: Integer
   existingEntryExitLayerChanges: Integer
   existingRegionCost: number
+  existingSegmentCount: number
 }
 
 export type SameLayerIntersectionCount = number

lib/visualizeTinyGraph.ts

@@ -118,7 +118,7 @@ const getRegionCostLabel = (
   regionId: RegionId,
 ): string => {
   const regionCache = solver.state.regionIntersectionCaches[regionId]
-  const regionCost = getRegionDisplayCost(solver, regionId)
+  const regionCost = regionCache?.existingRegionCost ?? 0
   const congestionCost = solver.state.regionCongestionCost[regionId] ?? 0
   const regionNetId = solver.problem.regionNetId[regionId]
   const regionNetLabel = regionNetId === -1 ? "free" : `${regionNetId}`
@@ -134,13 +134,6 @@ const getRegionCostLabel = (
   )
 }
 
-const getRegionDisplayCost = (
-  solver: TinyHyperGraphSolver,
-  regionId: RegionId,
-): number =>
-  (solver.state.regionIntersectionCaches[regionId]?.existingRegionCost ?? 0) +
-  (solver.state.regionCongestionCost[regionId] ?? 0)
-
 const getBaseRegionFillColor = (
   solver: TinyHyperGraphSolver,
   regionId: RegionId,
@@ -171,7 +164,9 @@ const getRegionRectFill = (
   regionId: RegionId,
 ): string => {
   const baseFill = getBaseRegionFillColor(solver, regionId)
-  const cost = clamp01(getRegionDisplayCost(solver, regionId))
+  const cost = clamp01(
+    solver.state.regionIntersectionCaches[regionId]?.existingRegionCost ?? 0,
+  )
   const redness = Math.pow(cost, 0.8)
 
   return toRgbaString(mixColor(baseFill, HOT_REGION_FILL, redness))

package.json

@@ -9,7 +9,7 @@
   "devDependencies": {
     "@biomejs/biome": "^2.4.8",
     "@tscircuit/hypergraph": "^0.0.71",
-    "@tscircuit/solver-utils": "^0.0.16",
+    "@tscircuit/solver-utils": "^0.0.17",
     "@types/bun": "latest",
     "cosmos": "^0.1.2",
     "dataset-hg07": "https://github.com/tscircuit/dataset-hg07",

scripts/profiling/hg07-first10.ts

@@ -47,12 +47,18 @@ const computeDatasetMaxRegionCost = (
     ]),
   )
 
-  serializedHyperGraph.regions.forEach((region, regionIndex) => {
-    regionIdToIndex.set(region.regionId, regionIndex)
+  topology.regionMetadata?.forEach((metadata, regionIndex) => {
+    const serializedRegionId = metadata?.serializedRegionId
+    if (typeof serializedRegionId === "string") {
+      regionIdToIndex.set(serializedRegionId, regionIndex)
+    }
   })
 
-  serializedHyperGraph.ports.forEach((port, portIndex) => {
-    portIdToIndex.set(port.portId, portIndex)
+  topology.portMetadata?.forEach((metadata, portIndex) => {
+    const serializedPortId = metadata?.serializedPortId
+    if (typeof serializedPortId === "string") {
+      portIdToIndex.set(serializedPortId, portIndex)
+    }
   })
 
   for (let routeId = 0; routeId < problem.routeCount; routeId++) {

tests/profiling/hg07-first10.test.ts

@@ -0,0 +1,20 @@
+import { expect, test } from "bun:test"
+
+test("hg07 first10 profiling script runs successfully", () => {
+  const result = Bun.spawnSync(
+    ["bun", "run", "scripts/profiling/hg07-first10.ts"],
+    {
+      cwd: process.cwd(),
+      stdout: "pipe",
+      stderr: "pipe",
+    },
+  )
+
+  const stdout = new TextDecoder().decode(result.stdout)
+  const stderr = new TextDecoder().decode(result.stderr)
+
+  expect(result.exitCode).toBe(0)
+  expect(stderr).toBe("")
+  expect(stdout).toContain("hg-07 first 10 solve profile")
+  expect(stdout).toContain("samples=10 failed=0")
+})