@tscircuit/matchpack 0.0.7 → 0.0.9

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { GraphicsObject } from 'graphics-debug';
 import { Point, Bounds } from '@tscircuit/math-utils';
-import { PhasedPackSolver } from 'calculate-packing';
+import { PackSolver2 } from 'calculate-packing';
 
 declare class BaseSolver {
     MAX_ITERATIONS: number;
@@ -120,7 +120,7 @@ type OutputLayout = {
 declare class SingleInnerPartitionPackingSolver extends BaseSolver {
     inputProblem: InputProblem;
     layout: OutputLayout | null;
-    phasedPackSolver: PhasedPackSolver | null;
+    activeSubSolver: PackSolver2 | null;
     constructor(inputProblem: InputProblem);
     _step(): void;
     private createPackInput;
@@ -164,7 +164,7 @@ declare class PartitionPackingSolver extends BaseSolver {
     packedPartitions: PackedPartition[];
     inputProblem: InputProblem;
     finalLayout: OutputLayout | null;
-    phasedPackSolver: PhasedPackSolver | null;
+    packSolver2: PackSolver2 | null;
     constructor(input: PartitionPackingSolverInput);
     _step(): void;
     private organizePackedPartitions;

package/dist/index.js

@@ -1,6 +1,6 @@
 // lib/solvers/BaseSolver.ts
 var BaseSolver = class {
-  MAX_ITERATIONS = 1e3;
+  MAX_ITERATIONS = 1e5;
   solved = false;
   failed = false;
   iterations = 0;
@@ -90,7 +90,7 @@ function rotatePoint(point, angleDegrees) {
 }
 function getRotatedDimensions(width, height, rotation) {
   const normalizedRotation = (rotation % 360 + 360) % 360;
-  if (normalizedRotation === 90 || normalizedRotation === 270) {
+  if (Math.round((normalizedRotation + 90) % 180) === 0) {
     return { width: height, height: width };
   }
   return { width, height };
@@ -453,7 +453,7 @@ var ChipPartitionsSolver = class extends BaseSolver {
 };
 
 // lib/solvers/PackInnerPartitionsSolver/SingleInnerPartitionPackingSolver.ts
-import { PhasedPackSolver } from "calculate-packing";
+import { PackSolver2 } from "calculate-packing";
 
 // lib/utils/networkFiltering.ts
 function createFilteredNetworkMapping(inputProblem) {
@@ -554,34 +554,28 @@ function createFilteredNetworkMapping(inputProblem) {
 var SingleInnerPartitionPackingSolver = class extends BaseSolver {
   inputProblem;
   layout = null;
-  phasedPackSolver = null;
   constructor(inputProblem) {
     super();
     this.inputProblem = inputProblem;
   }
   _step() {
-    try {
-      if (!this.phasedPackSolver) {
-        const packInput = this.createPackInput();
-        this.phasedPackSolver = new PhasedPackSolver(packInput);
-        this.activeSubSolver = this.phasedPackSolver;
-      }
-      this.phasedPackSolver.step();
-      if (this.phasedPackSolver.failed) {
-        this.failed = true;
-        this.error = `PhasedPackSolver failed: ${this.phasedPackSolver.error}`;
-        return;
-      }
-      if (this.phasedPackSolver.solved) {
-        this.layout = this.createLayoutFromPackingResult(
-          this.phasedPackSolver.getResult()
-        );
-        this.solved = true;
-        this.activeSubSolver = null;
-      }
-    } catch (error) {
+    if (!this.activeSubSolver) {
+      const packInput = this.createPackInput();
+      this.activeSubSolver = new PackSolver2(packInput);
+      this.activeSubSolver = this.activeSubSolver;
+    }
+    this.activeSubSolver.step();
+    if (this.activeSubSolver.failed) {
       this.failed = true;
-      this.error = `Failed to pack partition: ${error}`;
+      this.error = `PackSolver2 failed: ${this.activeSubSolver.error}`;
+      return;
+    }
+    if (this.activeSubSolver.solved) {
+      this.layout = this.createLayoutFromPackingResult(
+        this.activeSubSolver.packedComponents
+      );
+      this.solved = true;
+      this.activeSubSolver = null;
     }
   }
   createPackInput() {
@@ -635,7 +629,7 @@ var SingleInnerPartitionPackingSolver = class extends BaseSolver {
       chipPlacements[chipId] = {
         x: packedComponent.center.x,
         y: packedComponent.center.y,
-        ccwRotationDegrees: packedComponent.ccwRotationDegrees || 0
+        ccwRotationDegrees: packedComponent.ccwRotationOffset || packedComponent.ccwRotationDegrees || 0
       };
     }
     return {
@@ -644,8 +638,8 @@ var SingleInnerPartitionPackingSolver = class extends BaseSolver {
     };
   }
   visualize() {
-    if (this.phasedPackSolver && !this.solved) {
-      return this.phasedPackSolver.visualize();
+    if (this.activeSubSolver && !this.solved) {
+      return this.activeSubSolver.visualize();
     }
     if (!this.layout) {
       return super.visualize();
@@ -725,12 +719,12 @@ var PackInnerPartitionsSolver = class extends BaseSolver {
 };
 
 // lib/solvers/PartitionPackingSolver/PartitionPackingSolver.ts
-import { PhasedPackSolver as PhasedPackSolver2 } from "calculate-packing";
+import { PackSolver2 as PackSolver22 } from "calculate-packing";
 var PartitionPackingSolver = class extends BaseSolver {
   packedPartitions;
   inputProblem;
   finalLayout = null;
-  phasedPackSolver = null;
+  packSolver2 = null;
   constructor(input) {
     super();
     this.packedPartitions = input.packedPartitions;
@@ -752,20 +746,20 @@ var PartitionPackingSolver = class extends BaseSolver {
         return;
       }
       const partitionGroups = this.organizePackedPartitions();
-      if (!this.phasedPackSolver) {
+      if (!this.packSolver2) {
         const packInput = this.createPackInput(partitionGroups);
-        this.phasedPackSolver = new PhasedPackSolver2(packInput);
-        this.activeSubSolver = this.phasedPackSolver;
+        this.packSolver2 = new PackSolver22(packInput);
+        this.activeSubSolver = this.packSolver2;
       }
-      this.phasedPackSolver.step();
-      if (this.phasedPackSolver.failed) {
+      this.packSolver2.step();
+      if (this.packSolver2.failed) {
         this.failed = true;
-        this.error = `PhasedPackSolver failed: ${this.phasedPackSolver.error}`;
+        this.error = `PackSolver2 failed: ${this.packSolver2.error}`;
         return;
       }
-      if (this.phasedPackSolver.solved) {
+      if (this.packSolver2.solved) {
         const packedLayout = this.applyPackingResult(
-          this.phasedPackSolver.getResult(),
+          this.packSolver2.packedComponents,
           partitionGroups
         );
         this.finalLayout = packedLayout;
@@ -948,8 +942,8 @@ var PartitionPackingSolver = class extends BaseSolver {
     };
   }
   visualize() {
-    if (this.phasedPackSolver && !this.solved) {
-      return this.phasedPackSolver.visualize();
+    if (this.packSolver2 && !this.solved) {
+      return this.packSolver2.visualize();
     }
     if (!this.finalLayout) {
       return super.visualize();
@@ -1051,7 +1045,7 @@ var LayoutPipelineSolver = class extends BaseSolver {
   constructor(inputProblem) {
     super();
     this.inputProblem = inputProblem;
-    this.MAX_ITERATIONS = 1e3;
+    this.MAX_ITERATIONS = 1e6;
     this.startTimeOfPhase = {};
     this.endTimeOfPhase = {};
     this.timeSpentOnPhase = {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tscircuit/matchpack",
   "main": "dist/index.js",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "files": [
     "dist"
   ],
@@ -21,7 +21,7 @@
     "@tscircuit/schematic-viewer": "^2.0.26",
     "@types/bun": "latest",
     "bpc-graph": "^0.0.66",
-    "calculate-packing": "^0.0.19",
+    "calculate-packing": "^0.0.28",
     "circuit-json": "^0.0.226",
     "graphics-debug": "^0.0.62",
     "react-cosmos": "^7.0.0",