@tscircuit/hypergraph 0.0.60 → 0.0.61

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { BaseSolver } from '@tscircuit/solver-utils';
-import { Matrix } from 'transformation-matrix';
 import { GraphicsObject, Point } from 'graphics-debug';
+import { Matrix } from 'transformation-matrix';
 
 type PortId = string;
 type GraphEdgeId = string;
@@ -62,7 +62,6 @@ type Candidate<RegionType extends Region = Region, RegionPortType extends Region
 type HyperGraph = {
     ports: RegionPort[];
     regions: Region[];
-    solvedRoutes?: SolvedRoute[];
 };
 type SerializedGraphPort = {
     portId: PortId;
@@ -84,11 +83,6 @@ type SerializedRegionPortAssignment = {
 type SerializedHyperGraph = {
     ports: SerializedGraphPort[];
     regions: SerializedGraphRegion[];
-    solvedRoutes?: SerializedSolvedRoute[];
-};
-type SerializedSolvedRoute = {
-    pathPortIds: PortId[];
-    connectionId: ConnectionId;
 };
 type Connection = {
     connectionId: ConnectionId;
@@ -185,6 +179,7 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
         greedyMultiplier?: number;
         rippingEnabled?: boolean;
         ripCost?: number;
+        inputSolvedRoutes?: SolvedRoute[];
     };
     getSolverName(): string;
     graph: HyperGraph;
@@ -205,6 +200,7 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
         greedyMultiplier?: number;
         rippingEnabled?: boolean;
         ripCost?: number;
+        inputSolvedRoutes?: SolvedRoute[];
     });
     getConstructorParams(): {
         inputGraph: SerializedHyperGraph;
@@ -212,7 +208,9 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
         greedyMultiplier: number;
         rippingEnabled: boolean;
         ripCost: number;
+        inputSolvedRoutes: SolvedRoute[];
     };
+    getOutput(): SolvedRoute[];
     computeH(candidate: CandidateType): number;
     /**
      * OVERRIDE THIS
@@ -312,6 +310,104 @@ declare class HyperGraphSolver<RegionType extends Region = Region, RegionPortTyp
     _step(): void;
 }
 
+type CreateHyperGraphSolverInput = {
+    inputGraph: HyperGraph | SerializedHyperGraph;
+    inputConnections: (Connection | SerializedConnection)[];
+    inputSolvedRoutes: SolvedRoute[];
+};
+type CreateHyperGraphSolver = (input: CreateHyperGraphSolverInput) => HyperGraphSolver<Region, RegionPort>;
+type SectionRoute = {
+    globalRoute: SolvedRoute;
+    globalConnection: Connection;
+    sectionConnection: Connection;
+    sectionRoute: SolvedRoute;
+    canRemainFixedInSectionSolve: boolean;
+    sectionStartIndex: number;
+    sectionEndIndex: number;
+};
+type HyperGraphSection = {
+    centralRegionId: RegionId;
+    sectionRegionIds: Set<RegionId>;
+    graph: HyperGraph;
+    connections: Connection[];
+    sectionRoutes: SectionRoute[];
+};
+declare class HyperGraphSectionOptimizer extends BaseSolver {
+    input: {
+        hyperGraphSolver: HyperGraphSolver<Region, RegionPort>;
+        inputSolvedRoutes: SolvedRoute[];
+        expansionHopsFromCentralRegion: number;
+        createHyperGraphSolver: CreateHyperGraphSolver;
+        computeRegionCost: (region: Region) => number;
+        regionCost: (region: Region) => number;
+        effort: number;
+        ACCEPTABLE_REGION_COST: number;
+        MAX_ATTEMPTS_PER_REGION: number;
+        MAX_ATTEMPTS_PER_SECTION?: number;
+        FRACTION_TO_REPLACE?: number;
+        alwaysRipConflicts?: boolean;
+        computeSolvedGraphCost?: (solvedRoutes: SolvedRoute[]) => number;
+    };
+    graph: HyperGraph;
+    connections: Connection[];
+    solvedRoutes: SolvedRoute[];
+    activeSection: HyperGraphSection | null;
+    baselineSectionCost: number;
+    baselineGlobalCost: number;
+    regionAttemptCounts: Map<string, number>;
+    sectionAttempts: number;
+    maxAttemptsPerRegion: number;
+    maxSectionAttempts: number;
+    fractionToReplace: number;
+    alwaysRipConflicts: boolean;
+    random: () => number;
+    activeSubSolver: HyperGraphSolver<Region, RegionPort> | null;
+    constructor(input: {
+        hyperGraphSolver: HyperGraphSolver<Region, RegionPort>;
+        inputSolvedRoutes: SolvedRoute[];
+        expansionHopsFromCentralRegion: number;
+        createHyperGraphSolver: CreateHyperGraphSolver;
+        computeRegionCost: (region: Region) => number;
+        regionCost: (region: Region) => number;
+        effort: number;
+        ACCEPTABLE_REGION_COST: number;
+        MAX_ATTEMPTS_PER_REGION: number;
+        MAX_ATTEMPTS_PER_SECTION?: number;
+        FRACTION_TO_REPLACE?: number;
+        alwaysRipConflicts?: boolean;
+        computeSolvedGraphCost?: (solvedRoutes: SolvedRoute[]) => number;
+    });
+    getSolverName(): string;
+    getConstructorParams(): {
+        inputGraph: SerializedHyperGraph;
+        inputConnections: SerializedConnection[];
+        inputSolvedRoutes: SolvedRoute[];
+        expansionHopsFromCentralRegion: number;
+        maxAttemptsPerRegion: number;
+        maxSectionAttempts: number;
+        effort: number;
+        fractionToReplace: number;
+        alwaysRipConflicts: boolean;
+        ACCEPTABLE_COST: number;
+    };
+    getOutput(): SolvedRoute[];
+    _setup(): void;
+    visualize(): GraphicsObject;
+    getCostOfRegionWithAttempts(region: Region): number;
+    computeCostOfSection({ section, solvedRoutes, }: {
+        section: HyperGraphSection;
+        solvedRoutes: SolvedRoute[];
+    }): number;
+    private computeSolvedGraphCost;
+    /**
+     * TODO default behavior should be to rip entire section
+     */
+    determineConnectionsToRip(section: HyperGraphSection, evaluationSolver: HyperGraphSolver<Region, RegionPort>): Set<string>;
+    private getNextCentralRegion;
+    private beginSectionSolve;
+    _step(): void;
+}
+
 type Bounds$1 = {
     minX: number;
     minY: number;
@@ -394,6 +490,7 @@ declare class JumperGraphSolver extends HyperGraphSolver<JRegion, JPort> {
     constructor(input: {
         inputGraph: HyperGraph | SerializedHyperGraph;
         inputConnections: (Connection | SerializedConnection)[];
+        inputSolvedRoutes?: SolvedRoute[];
         ripCost?: number;
         portUsagePenalty?: number;
         crossingPenalty?: number;
@@ -1008,6 +1105,7 @@ declare class ViaGraphSolver extends HyperGraphSolver<JRegion, JPort> {
     constructor(input: {
         inputGraph: HyperGraph | SerializedHyperGraph;
         inputConnections: (Connection | SerializedConnection)[];
+        inputSolvedRoutes?: SolvedRoute[];
         viaTile?: ViaTile;
         ripCost?: number;
         portUsagePenalty?: number;
@@ -1191,4 +1289,4 @@ declare function generateConvexViaTopologyRegions(opts: {
     };
 };
 
-export { type Bounds$1 as Bounds, type BuildOpts, type Candidate, ConnectBuilder, type ConnectOpts, type Connection, type ConnectionId, type ConvexViaGraphFromXYConnectionsResult, type GScore, type GraphEdgeId, type HyperGraph, HyperGraphSolver, type JPort, type JRegion, JUMPER_GRAPH_SOLVER_DEFAULTS, type JumperGraph, JumperGraphSolver, type JumperGraphWithConnections, type NetworkId, type PortAssignment, PortBuilder, type PortData, type PortId, type PortSpread, type Region, RegionBuilder, type RegionData, type RegionId, type RegionPort, type RegionPortAssignment, type RegionRef, type RouteSegment, type SerializedConnection, type SerializedGraphPort, type SerializedGraphRegion, type SerializedHyperGraph, type SerializedRegionPortAssignment, type SerializedSolvedRoute, type SharedBoundary, type SolvedRoute, Topology, TopologyError, VIA_GRAPH_SOLVER_DEFAULTS, type ValidateOpts, type ViaByNet, type ViaData, ViaGraphSolver, type ViaGraphWithConnections, type ViaTile, type ViaTileRecommendation, type ViaTileRecommendationCandidate, type ViaTileRecommendationProblemInput, type XYConnection, applyTransformToGraph, calculateGraphBounds, convertConnectionsToSerializedConnections, convertHyperGraphToSerializedHyperGraph, createConvexViaGraphFromXYConnections, createGraphWithConnectionsFromBaseGraph, createViaGraphWithConnections, generateConvexViaTopologyRegions, generateDefaultViaTopologyRegions, generateJumperGrid, generateJumperX4Grid, generateViaTopologyRegions, recommendViaTileFromGraphInput, rotateGraph90Degrees, viaTile4Regions as viaTile };
+export { type Bounds$1 as Bounds, type BuildOpts, type Candidate, ConnectBuilder, type ConnectOpts, type Connection, type ConnectionId, type ConvexViaGraphFromXYConnectionsResult, type CreateHyperGraphSolver, type CreateHyperGraphSolverInput, type GScore, type GraphEdgeId, type HyperGraph, type HyperGraphSection, HyperGraphSectionOptimizer, HyperGraphSolver, type JPort, type JRegion, JUMPER_GRAPH_SOLVER_DEFAULTS, type JumperGraph, JumperGraphSolver, type JumperGraphWithConnections, type NetworkId, type PortAssignment, PortBuilder, type PortData, type PortId, type PortSpread, type Region, RegionBuilder, type RegionData, type RegionId, type RegionPort, type RegionPortAssignment, type RegionRef, type RouteSegment, type SectionRoute, type SerializedConnection, type SerializedGraphPort, type SerializedGraphRegion, type SerializedHyperGraph, type SerializedRegionPortAssignment, type SharedBoundary, type SolvedRoute, Topology, TopologyError, VIA_GRAPH_SOLVER_DEFAULTS, type ValidateOpts, type ViaByNet, type ViaData, ViaGraphSolver, type ViaGraphWithConnections, type ViaTile, type ViaTileRecommendation, type ViaTileRecommendationCandidate, type ViaTileRecommendationProblemInput, type XYConnection, applyTransformToGraph, calculateGraphBounds, convertConnectionsToSerializedConnections, convertHyperGraphToSerializedHyperGraph, createConvexViaGraphFromXYConnections, createGraphWithConnectionsFromBaseGraph, createViaGraphWithConnections, generateConvexViaTopologyRegions, generateDefaultViaTopologyRegions, generateJumperGrid, generateJumperX4Grid, generateViaTopologyRegions, recommendViaTileFromGraphInput, rotateGraph90Degrees, viaTile4Regions as viaTile };