@tscircuit/matchpack 0.0.1 → 0.0.3

package/dist/index.d.ts

@@ -47,6 +47,7 @@ type Chip = {
     chipId: ChipId;
     pins: PinId[];
     size: Point;
+    availableRotations?: Array<0 | 90 | 180 | 270>;
 };
 type Group = {
     groupId: GroupId;
@@ -70,6 +71,10 @@ type InputProblem = {
     /** This is a two-way map */
     pinStrongConnMap: Record<`${PinId}-${PinId}`, boolean>;
     netConnMap: Record<`${PinId}-${NetId}`, boolean>;
+    /** The minimum gap between chips within a partition */
+    chipGap: number;
+    /** The minimum gap between two partitions */
+    partitionGap: number;
 };
 
 /**
@@ -118,10 +123,12 @@ type LaidOutPartition = InputProblem;
 interface PartitionPackingSolverInput {
     resolvedLayout: OutputLayout;
     laidOutPartitions: LaidOutPartition[];
+    inputProblem: InputProblem;
 }
 declare class PartitionPackingSolver extends BaseSolver {
     resolvedLayout: OutputLayout;
     laidOutPartitions: LaidOutPartition[];
+    inputProblem: InputProblem;
     finalLayout: OutputLayout | null;
     phasedPackSolver: PhasedPackSolver | null;
     constructor(input: PartitionPackingSolverInput);
@@ -174,7 +181,6 @@ declare class SinglePinRangeLayoutSolver extends BaseSolver {
     inputProblem: InputProblem;
     layoutApplied: boolean;
     layout: OutputLayout | null;
-    debugPackInput: any;
     constructor(pinRange: PinRange, inputProblem: InputProblem);
     _step(): void;
     /**

package/dist/index.js

@@ -20727,7 +20727,9 @@ var ChipPartitionsSolver = class extends BaseSolver {
       groupPinMap,
       netMap,
       pinStrongConnMap,
-      netConnMap
+      netConnMap,
+      chipGap: originalProblem.chipGap,
+      partitionGap: originalProblem.partitionGap
     };
   }
   visualize() {
@@ -20747,12 +20749,14 @@ var ChipPartitionsSolver = class extends BaseSolver {
 var PartitionPackingSolver = class extends BaseSolver {
   resolvedLayout;
   laidOutPartitions;
+  inputProblem;
   finalLayout = null;
   phasedPackSolver = null;
   constructor(input) {
     super();
     this.resolvedLayout = input.resolvedLayout;
     this.laidOutPartitions = input.laidOutPartitions;
+    this.inputProblem = input.inputProblem;
   }
   _step() {
     try {
@@ -20830,14 +20834,18 @@ var PartitionPackingSolver = class extends BaseSolver {
     const resolvedLayout = this.resolvedLayout;
     const pinToNetworkMap = /* @__PURE__ */ new Map();
     for (const laidOutPartition of this.laidOutPartitions) {
-      for (const [connKey, connected] of Object.entries(laidOutPartition.netConnMap)) {
+      for (const [connKey, connected] of Object.entries(
+        laidOutPartition.netConnMap
+      )) {
         if (!connected) continue;
         const [pinId, netId] = connKey.split("-");
         if (pinId && netId) {
           pinToNetworkMap.set(pinId, netId);
         }
       }
-      for (const [connKey, connected] of Object.entries(laidOutPartition.pinStrongConnMap)) {
+      for (const [connKey, connected] of Object.entries(
+        laidOutPartition.pinStrongConnMap
+      )) {
         if (!connected) continue;
         const pins = connKey.split("-");
         if (pins.length === 2 && pins[0] && pins[1]) {
@@ -20883,15 +20891,32 @@ var PartitionPackingSolver = class extends BaseSolver {
           });
         }
       }
+      let availableRotationDegrees = [
+        0,
+        90,
+        180,
+        270
+      ];
+      for (const chipId of group.chipIds) {
+        const chip = this.laidOutPartitions[group.partitionIndex].chipMap[chipId];
+        const chipRotations = chip.availableRotations || [0, 90, 180, 270];
+        availableRotationDegrees = availableRotationDegrees.filter(
+          (rotation2) => chipRotations.includes(rotation2)
+        );
+      }
+      if (availableRotationDegrees.length === 0) {
+        availableRotationDegrees = [0];
+      }
       return {
         componentId: `partition_${group.partitionIndex}`,
-        pads
+        pads,
+        availableRotationDegrees
       };
     });
     return {
       components: packComponents,
-      minGap: 2,
-      // Generous gap between partitions
+      minGap: this.inputProblem.partitionGap,
+      // Use partitionGap from input problem
       packOrderStrategy: "largest_to_smallest",
       packPlacementStrategy: "minimum_sum_squared_distance_to_network"
     };
@@ -20942,7 +20967,9 @@ var PartitionPackingSolver = class extends BaseSolver {
       groupPinMap: {},
       pinStrongConnMap: {},
       netMap: {},
-      netConnMap: {}
+      netConnMap: {},
+      chipGap: this.inputProblem.chipGap,
+      partitionGap: this.inputProblem.partitionGap
     };
     for (const laidOutPartition of this.laidOutPartitions) {
       Object.assign(combinedProblem.chipMap, laidOutPartition.chipMap);
@@ -20961,7 +20988,8 @@ var PartitionPackingSolver = class extends BaseSolver {
   getConstructorParams() {
     return {
       resolvedLayout: this.resolvedLayout,
-      laidOutPartitions: this.laidOutPartitions
+      laidOutPartitions: this.laidOutPartitions,
+      inputProblem: this.inputProblem
     };
   }
 };
@@ -20972,8 +21000,6 @@ var SinglePinRangeLayoutSolver = class extends BaseSolver {
   inputProblem;
   layoutApplied = false;
   layout = null;
-  debugPackInput = null;
-  // For debugging - captures the pack input
   constructor(pinRange, inputProblem) {
     super();
     this.pinRange = pinRange;
@@ -21175,7 +21201,8 @@ var SinglePinRangeLayoutSolver = class extends BaseSolver {
       });
       return {
         componentId: chipId,
-        pads
+        pads,
+        availableRotationDegrees: chip.availableRotations || [0, 90, 180, 270]
       };
     });
     if (components.length === 0) {
@@ -21186,12 +21213,11 @@ var SinglePinRangeLayoutSolver = class extends BaseSolver {
     }
     const packInput = {
       components,
-      minGap: 0.2,
-      // Tighter gap than general layout
+      minGap: this.inputProblem.chipGap,
+      // Use chipGap from input problem
       packOrderStrategy: "largest_to_smallest",
       packPlacementStrategy: "minimum_sum_squared_distance_to_network"
     };
-    this.debugPackInput = packInput;
     const packResult = pack(packInput);
     const chipPlacements = {};
     for (const component of packResult.components) {
@@ -22097,10 +22123,13 @@ var LayoutPipelineSolver = class extends BaseSolver {
     definePipelineStep(
       "partitionPackingSolver",
       PartitionPackingSolver,
-      () => [{
-        resolvedLayout: this.pinRangeOverlapSolver.resolvedLayout,
-        laidOutPartitions: this.chipPartitions || [this.inputProblem]
-      }],
+      () => [
+        {
+          resolvedLayout: this.pinRangeOverlapSolver.resolvedLayout,
+          laidOutPartitions: this.chipPartitions || [this.inputProblem],
+          inputProblem: this.inputProblem
+        }
+      ],
       {
         onSolved: (_solver) => {
         }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/matchpack",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "files": [
     "dist"
   ],